diff --git a/src/api/yingji/keyEnterprise.js b/src/api/yingji/keyEnterprise.js
index 2faf740..6495096 100644
--- a/src/api/yingji/keyEnterprise.js
+++ b/src/api/yingji/keyEnterprise.js
@@ -84,7 +84,14 @@ export function listDist(query) {
         params: query
     })
 }
-
+//计划企业表数结构
+export function planeEnTree(data) {
+    return request({
+        url: '/pharmaceuticals/bPlanEnterprise/tree',
+        method: 'get',
+        params:data
+    })
+}
 // 行政区划树结构
 export function xzTree() {
     return request({
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4f2fdc4..4d4a105 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -138,7 +138,10 @@ export default {
       })
         .then(() => {
           this.$store.dispatch("LogOut").then(() => {
-            location.href = "/demo/suzhouyingjiPC/";
+            location.href =
+              process.env.NODE_ENV === "production"
+                ? "/demo/suzhouyingjiPC/"
+                : "/";
           });
         })
         .catch(() => {});
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index e1a3b1a..b61014f 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -78,12 +78,11 @@ export default {
       dept: (state) => state.user.dept,
       username: (state) => state.user.name,
       roles: (state) => state.user.roles,
-      newRouter:(state) => state.user.newRouter,
-      new1:(state) => state.user.new1,
+      newRouter: (state) => state.user.newRouter,
+      new1: (state) => state.user.new1,
     }),
   },
-  created() {
-  },
+  created() {},
   watch: {
     $route: {
       handler(n, o) {
@@ -111,7 +110,10 @@ export default {
       })
         .then(() => {
           this.$store.dispatch("LogOut").then(() => {
-            location.href = "/demo/suzhouyingjiPC/";
+            location.href =
+              process.env.NODE_ENV === "production"
+                ? "/demo/suzhouyingjiPC/"
+                : "/";
           });
         })
         .catch(() => {});
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 28ea9aa..c70396a 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -127,7 +127,7 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`)
+    return (resolve) => require([`@/views/${view}`], resolve)
   }
 }
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 63bf066..c9e993c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -153,7 +153,7 @@ const user = {
               toRouter = arr1
             } else {
               //区级和镇级
-              if (user.dept.parentId == 100 || user.dept.parentId == 101) {
+              if (user.dept.parentId != 0) {
                 arr2 = arr1.filter((value) => {
                   return value.path == "/planManage";
                 });
diff --git a/src/views/login.vue b/src/views/login.vue
index 5a0bcaf..93b7198 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,6 +5,7 @@
       <div class="lg-text">苏州应急执法计划管理系统</div>
     </div>
     <div class="lg-centerbox">
+      <div class="lg-backImg"></div>
       <el-form
         ref="loginForm"
         :model="loginForm"
@@ -76,7 +77,6 @@
           </div>
         </el-form-item>
       </el-form>
-      <div class="lg-backImg"></div>
     </div>
 
     <!--  底部  -->
@@ -239,7 +239,9 @@ export default {
     height: calc(100% - 200px);
     width: 100%;
     display: flex;
-    flex-direction: row-reverse;
+    // align-items: center;
+    justify-content: center;
+    // flex-direction: row-reverse;
   }
 }
 .iconO {
@@ -281,7 +283,7 @@ export default {
   height: 360px;
   box-sizing: border-box;
   padding: 35px 35px 5px 35px;
-  margin-right: 260px;
+  // margin-right: 260px;
   margin-top: 20px;
   background: rgba(229, 236, 246, 0.95);
   box-shadow: 0px 1px 32px 0px #0c4990;
diff --git a/src/views/yingji/echarts/executive.vue b/src/views/yingji/echarts/executive.vue
new file mode 100644
index 0000000..712d4b9
--- /dev/null
+++ b/src/views/yingji/echarts/executive.vue
@@ -0,0 +1,78 @@
+<template>
+  <div >
+    <el-cascader
+      size="small"
+      v-model="district"
+      :options="compartment"
+      :show-all-levels="false"
+      :disabled="isNoneDivision"
+      :props="props"
+      @change="getData"
+    ></el-cascader>
+  </div>
+</template>
+<script>
+import { xzTree } from "@/api/yingji/keyEnterprise.js";
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      //区划的禁用
+      district: "",
+      compartment: [],
+      isNoneDivision: false,
+      props: {
+        checkStrictly: true,
+        value: "value",
+        label: "label",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    this.xzList();
+  },
+  computed: {
+    ...mapState({
+      //根据存储的dept.parentId判断是哪个等级
+      dept: (state) => state.user.dept,
+    }),
+  },
+  methods: {
+    xzList() {
+      xzTree().then((res) => {
+        // console.log(this.dept.parentId);
+        if (this.dept.parentId == 0) {
+          res.data.forEach((value, index) => {
+            this.compartment.push({
+              value: value.county,
+              label: value.institutionName,
+              children: [],
+            });
+            if (value.children.length > 0) {
+              value.children.forEach((value1, index1) => {
+                this.compartment[index].children.push({
+                  value: value1.subdistrict,
+                  label: value1.institutionName,
+                });
+              });
+            }
+          });
+        }
+      });
+    },
+    getData(e) {
+      if (e.length == 1) {
+        this.$emit("quhua", e[0].slice(0, 8));
+      } else if (e.length == 2 && e[0] == e[1]) {
+        this.$emit("quhua", e[0].slice(0, 8));
+      } else {
+        this.$emit("quhua", e[1].slice(0, 11));
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 970d2e7..82db706 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -23,13 +23,8 @@
         </div>
         <div class="select-input">
           <div class="select-span">区划:</div>
-          <el-cascader
-            size="small"
-            v-model="district"
-            :options="compartment"
-            :disabled="isNoneDivision"
-            :props="props"
-          ></el-cascader>
+        
+          <executive @quhua="quhua"></executive>
         </div>
         <div class="my-checkbox">
           <el-checkbox-group v-model="checkList" @change="setmealSelect">
@@ -157,6 +152,7 @@
 </template>
   
   <script>
+import executive from "./echarts/executive";
 import myPagination from "@/views/components/myPagination/index.vue";
 import {
   businessList,
@@ -164,9 +160,8 @@ import {
   xzTree,
   enforcingGet,
 } from "@/api/yingji/keyEnterprise.js";
-import { mapState } from "vuex";
 export default {
-  components: { myPagination },
+  components: { myPagination, executive },
   name: "Article",
   data() {
     return {
@@ -185,119 +180,110 @@ export default {
       checkListTwo: [],
       listDes: [
         {
-          eng: "bizAddr",
-          label: "生产经营地址",
-          value: "",
-        },
-        {
-          eng: "bossEmail",
-          label: "主要负责人电子邮箱",
+          eng: "entprName",
+          label: "企业名称",
           value: "",
         },
         {
-          eng: "bossMobtel",
-          label: "主要负责人移动电话",
+          eng: "uscCode",
+          label: "统一社会信用代码",
           value: "",
         },
         {
-          eng: "bossTel",
-          label: "主要负责人固定电话",
+          eng: "CREATETIME",
+          label: "创建时间",
           value: "",
         },
         {
-          eng: "cseNum",
-          label: "注册安全工程师人员数量",
+          eng: "UPDATETIME",
+          label: "修改时间",
           value: "",
         },
-
         {
-          eng: "doublePreven",
-          label: "是否开展双重预防机制",
+          eng: "enterpriseUnitVersion",
+          label: "钢铁三年专项时，企业设施的版本号",
           value: "",
         },
         {
-          eng: "ecoTypeLarge",
-          label: "经济类型大类",
+          eng: "examineStartTime",
+          label: "检查开始时间",
           value: "",
         },
         {
-          eng: "ecoTypeSmall",
-          label: "经济类型小类",
+          eng: "examineEndTime",
+          label: "检查结束时间",
           value: "",
         },
         {
-          eng: "employeeNum",
-          label: "从业人员数量",
+          eng: "examineSite",
+          label: "检查场所",
           value: "",
         },
         {
-          eng: "enterColorChart",
-          label: "企业分色图",
+          eng: "examineSituation",
+          label: "检查情况",
           value: "",
         },
         {
-          eng: "entprName",
-          label: "企业名称",
+          eng: "examineSource",
+          label: "检查来源",
           value: "",
         },
+
         {
-          eng: "floorArea",
-          label: "占地面积",
+          eng: "examineType",
+          label: "检查方式",
           value: "",
         },
         {
-          eng: "fullEmegNum",
-          label: "专职应急管理人员数量",
+          eng: "executorDept",
+          label: "执法部门",
           value: "",
         },
         {
-          eng: "fullSafety",
-          label: "是否有专职安全人员",
+          eng: "executorDeptCode",
+          label: "执法部门代码",
           value: "",
         },
         {
-          eng: "fullSafetyNum",
-          label: "专职安全生产管理人员数量",
+          eng: "executorId",
+          label: "检查人员id",
           value: "",
         },
         {
-          eng: "gridCode",
-          label: "网格编码",
+          eng: "expertsInFlag",
+          label: "是否专家参与",
           value: "",
         },
         {
-          eng: "infoYear",
-          label: "数据年份",
+          eng: "expertsName",
+          label: "专家姓名",
           value: "",
         },
         {
-          eng: "isPoint",
-          label: "是否重点",
+          eng: "planExamineId",
+          label: "检查方案id",
           value: "",
         },
         {
-          eng: "legalPerson",
-          label: "法定代表人",
+          eng: "sourceData",
+          label: "数据来源",
           value: "",
         },
         {
-          eng: "majorHazardInstallations",
-          label: "是否存在重大危险源",
+          eng: "threeSpecialType",
+          label: "是否是三年专项",
           value: "",
         },
         {
-          eng: "majorHazardLevel",
-          label: "重大危险源等级",
+          eng: "typeCode",
+          label: "文书类型",
           value: "",
         },
+
         {
-          eng: "regAddr",
-          label: "注册地址",
-          value: "",
-        },
-        {
-          eng: "uscCode",
-          label: "统一社会信用代码",
+          eng: "writNo",
+          label: "文书文号",
           value: "",
         },
       ],
@@ -308,27 +294,11 @@ export default {
       details: {},
       addShow: false,
       detailLoad: true,
-      compartment: [],
       //区划的禁用
-      isNoneDivision: false,
-      newQHList: [],
-      props: {
-        checkStrictly: true,
-        value: "value",
-        label: "label",
-        children: "children",
-      },
     };
   },
   created() {
     this.getList();
-    this.xzList();
-  },
-  computed: {
-    ...mapState({
-      //根据存储的dept.parentId判断是哪个等级
-      dept: (state) => state.user.dept,
-    }),
   },
   methods: {
     reset() {
@@ -337,6 +307,7 @@ export default {
         plannedYear: "",
         checkStatus: "",
       };
+      // this.district = [];
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
@@ -347,28 +318,6 @@ export default {
       this.reset();
       this.getList();
     },
-
-    xzList() {
-      xzTree().then((res) => {
-        if (this.dept.parentId == 0) {
-          res.data.forEach((value, index) => {
-            this.compartment.push({
-              value: value.county,
-              label: value.institutionName,
-              children: [],
-            });
-            if (value.children.length > 0) {
-              value.children.forEach((value1, index1) => {
-                this.compartment[index].children.push({
-                  value: value1.subdistrict,
-                  label: value1.institutionName,
-                });
-              });
-            }
-          });
-        }
-      });
-    },
     shutDownDetail() {
       this.addShow = false;
     },
@@ -376,12 +325,23 @@ export default {
       this.addShow = true;
       this.detailLoad = true;
       enforcingGet(e.longId).then((res) => {
-        console.log(res);
+        for (let key in res.data) {
+          this.listDes.forEach((value1, index1) => {
+            if (key == value1.eng) {
+              this.listDes[index1].value = res.data[key];
+              return;
+            }
+          });
+        }
+        this.detailLoad = false;
       });
     },
+    quhua(e) {
+      this.district = e;
+    },
     searchList() {
       if (this.district) {
-        this.form.district = this.district[0];
+        this.form.district = this.district;
       }
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 3d1332e..abdd957 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -4,14 +4,15 @@
       <div class="one-line">
         <div class="select-input">
           <div class="select-span">行政区划:</div>
-          <el-cascader
+          <!-- <el-cascader
             v-model="subdistrict"
             placeholder="请选择"
             :options="xzList"
             :props="props"
             :disabled="isNoneDivision"
           >
-          </el-cascader>
+          </el-cascader> -->
+          <executive @quhua="quhua"></executive>
         </div>
         <div class="select-input">
           <div class="select-span">经济类型:</div>
@@ -132,14 +133,14 @@
             <div>
               {{
                 scope.row.indusTypeClass != "null"
-                  ? scope.row.indusTypeClass
+                  ? filterTable(options.category, scope.row.indusTypeClass)
                   : ""
               }}
             </div>
           </template>
         </el-table-column>
         <el-table-column
-          prop="entprColor"
+          prop="enterColorChart"
           label="企业分色"
           header-align="center"
         >
@@ -147,7 +148,7 @@
             <div>
               {{
                 scope.row.enterColorChart != "null"
-                  ? scope.row.enterColorChart
+                  ? filterTable(options.entpr_color, scope.row.enterColorChart)
                   : ""
               }}
             </div>
@@ -231,10 +232,11 @@
   <script>
 import myPagination from "@/views/components/myPagination/index.vue";
 import { businessList, listDist, xzTree } from "@/api/yingji/keyEnterprise";
-import { mapState } from "vuex";
+// import { mapState } from "vuex";
+import executive from "./echarts/executive";
 
 export default {
-  components: { myPagination },
+  components: { myPagination, executive },
   name: "Order",
   data() {
     return {
@@ -248,12 +250,7 @@ export default {
         entprColor: "",
         uscCode: "",
       },
-      props: {
-        checkStrictly: true,
-        value: "value",
-        label: "label",
-        children: "children",
-      },
+
       xzqh: "",
       searchBefore: {
         pageSize: 10,
@@ -578,101 +575,114 @@ export default {
       addShow: false,
       details: null,
       //==
-      isNoneDivision: false,
-      newQHList: [],
       subdistrict: [],
-      isPointOption:[
+      isPointOption: [
         {
-          dictValue:1,
-          dictLabel:'是'
+          dictValue: 1,
+          dictLabel: "是",
         },
         {
-          dictValue:0,
-          dictLabel:'否'
+          dictValue: 0,
+          dictLabel: "否",
+        },
+      ],
+      guimoOption: [
+        {
+          dictValue: 1,
+          dictLabel: "规模以上",
         },
-      ]
+        {
+          dictValue: 0,
+          dictLabel: "规模一下",
+        },
+      ],
     };
   },
   created() {
     this.getList();
     this.getDict();
   },
-  computed: {
-    ...mapState({
-      //根据存储的dept.parentId判断是哪个等级
-      dept: (state) => state.user.dept,
-    }),
-  },
   methods: {
+    getDict() {
+      listDist({
+        list: "economic_categories,category,major_hazard_level,entpr_color",
+      }).then((res) => {
+        this.options = res.data;
+      });
+    },
     filterTable(a, b) {
       let arr = [];
       if (!b) return;
-      if (a == this.options.major_hazard_level) {
-        arr = a.filter((value) => {
-          return "0" + value.dictValue == b;
-        });
-      }
       arr = a.filter((value) => {
         return value.dictValue == b;
       });
-      return arr[0].dictLabel;
+      return arr[0].dictLabel || b;
     },
     shutDownDetail() {
       this.addShow = false;
     },
     look(e) {
       this.addShow = true;
-      console.log(e);
       this.details = e;
       for (let key in this.details) {
         this.listDes.forEach((value1, index1) => {
-          // if(key == value1.eng ){
-          //   this.listDes[index1].value =this.filterTable(this.isPointOption, this.details[key]) ;
-          //   return;
-          // }
           if (key == value1.eng) {
             this.listDes[index1].value = this.details[key];
-            
             return;
           }
         });
       }
-      for (let key1 in this.listDes) {
-        
-      }
-      console.log(this.filterTable(this.isPointOption, this.listDes[30].value) );
-    },
-    getDict() {
-      xzTree().then((res1) => {
-        console.log(res1);
-        if (this.dept.parentId == 0) {
-          res1.data.forEach((value, index) => {
-            this.xzList.push({
-              value: value.county,
-              label: value.institutionName,
-              children: [],
-            });
-            if (value.children.length > 0) {
-              value.children.forEach((value1, index1) => {
-                this.xzList[index].children.push({
-                  value: value1.subdistrict,
-                  label: value1.institutionName,
-                });
-              });
-            }
-          });
+      this.listDes.forEach((value1, index1) => {
+        if (value1.eng == "isPoint") {
+          this.listDes[index1].value = this.filterTable(
+            this.isPointOption,
+            value1.value
+          );
+        }
+        if (value1.eng == "majorHazardLevel") {
+          this.listDes[index1].value = this.filterTable(
+            this.options.major_hazard_level,
+            value1.value
+          );
+        }
+        if (value1.eng == "ecoTypeLarge") {
+          this.listDes[index1].value = this.filterTable(
+            this.options.economic_categories,
+            value1.value
+          );
+        }
+        if (value1.eng == "indusTypeClass") {
+          this.listDes[index1].value = this.filterTable(
+            this.options.category,
+            value1.value
+          );
+        }
+        if (value1.eng == "enterColorChart") {
+          this.listDes[index1].value = this.filterTable(
+            this.options.entpr_color,
+            value1.value
+          );
+        }
+        if (value1.eng == "safetyDepart") {
+          this.listDes[index1].value = this.filterTable(
+            this.isPointOption,
+            value1.value
+          );
+        }
+        if (value1.eng == "fullSafety") {
+          this.listDes[index1].value = this.filterTable(
+            this.guimoOption,
+            value1.value
+          );
         }
-      });
-      listDist({
-        list: "economic_categories,category,major_hazard_level,entpr_color",
-      }).then((res) => {
-        this.options = res.data;
       });
     },
-
+    quhua(e) {
+      this.subdistrict = e;
+    },
     searchList() {
       if (this.subdistrict) {
-        this.form.subdistrict = this.subdistrict[0];
+        this.form.subdistrict = this.subdistrict;
       }
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
@@ -687,6 +697,7 @@ export default {
         entprColor: "",
         uscCode: "",
       };
+      // this.subdistrict = []
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
diff --git a/src/views/yingji/focusEnter.vue b/src/views/yingji/focusEnter.vue
index 8087fb0..4f96d31 100644
--- a/src/views/yingji/focusEnter.vue
+++ b/src/views/yingji/focusEnter.vue
@@ -23,24 +23,26 @@
             </el-date-picker>
           </div>
         </div>
-        <!-- <div class="select-input">
+        <div class="select-input">
           <div class="select-span">区划:</div>
-          <el-cascader
-            v-model="subdistrict"
+          <!-- <el-cascader
+            size="small"
+            v-model="district"
             placeholder="请选择"
             :options="xzList"
             :props="props"
             :disabled="isNoneDivision"
           >
-          </el-cascader>
-        </div> -->
-        <!-- <div class="input-input">
-          <div class="select-span">企业名称/统一社会信用代码:</div>
+          </el-cascader> -->
+          <executive @quhua="quhua"></executive>
+        </div>
+        <div class="select-input">
           <el-input
-            v-model="form.uscCode"
-            placeholder="请输入企业名称/统一社会信用代码"
+            v-model="queryParms.entCode"
+            size="small"
+            placeholder="请输入统一社会信用代码"
           ></el-input>
-        </div> -->
+        </div>
       </div>
       <div style="display: flex">
         <div class="export" @click="addkeys" style="background-color: #28b384">
@@ -199,6 +201,21 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row>
+                <el-col>
+                  <el-form-item label="行政区划:" prop="type">
+                    <el-cascader
+                      size="small"
+                      v-model="queryParmsdistrict"
+                      placeholder="请选择"
+                      :options="xzList"
+                      :props="props"
+                      :disabled="isNoneDivision"
+                    >
+                    </el-cascader>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <el-row>
                 <el-col>
                   <el-form-item label="备注:" prop="remark">
@@ -260,7 +277,10 @@
               <el-descriptions-item label="企业类别">{{
                 details.type
               }}</el-descriptions-item>
-              <el-descriptions-item label="备注">{{
+              <el-descriptions-item label="行政区划">{{
+                details.district
+              }}</el-descriptions-item>
+              <el-descriptions-item  label="备注">{{
                 details.remark
               }}</el-descriptions-item>
             </el-descriptions>
@@ -274,7 +294,7 @@
   <script>
 import myPagination from "@/views/components/myPagination/index.vue";
 import { Loading } from "element-ui";
-
+import executive from "./echarts/executive";
 import {
   listEnterprise,
   addEnterprise,
@@ -282,9 +302,12 @@ import {
   deleteEnterprise,
   exportEnterprise,
   getEnterprise,
+  xzTree,
 } from "@/api/yingji/keyEnterprise.js";
+import { mapState } from "vuex";
+
 export default {
-  components: { myPagination },
+  components: { myPagination, executive },
   name: "Article",
   data() {
     return {
@@ -299,7 +322,19 @@ export default {
       dialogVisible: false,
       queryParms: {
         year: "",
+        uscCode: "",
+        district: "",
+      },
+      queryParmsdistrict: [],
+      district: [],
+      xzList: [],
+      props: {
+        checkStrictly: true,
+        value: "value",
+        label: "label",
+        children: "children",
       },
+      isNoneDivision: false,
       searchBefore: {
         pageSize: 10,
         pageNum: 1,
@@ -316,6 +351,7 @@ export default {
         type: "",
         //年份
         year: "",
+        district: "",
       },
       addShow: false,
       //详情
@@ -335,11 +371,45 @@ export default {
     };
   },
   created() {
+    this.getTreeList();
     this.getList();
   },
+  computed: {
+    ...mapState({
+      //根据存储的dept.parentId判断是哪个等级
+      dept: (state) => state.user.dept,
+    }),
+  },
   methods: {
+    getTreeList() {
+      xzTree().then((res1) => {
+        if (this.dept.parentId == 0) {
+          res1.data.forEach((value, index) => {
+            this.xzList.push({
+              value: value.county,
+              label: value.institutionName,
+              children: [],
+            });
+            if (value.children.length > 0) {
+              value.children.forEach((value1, index1) => {
+                this.xzList[index].children.push({
+                  value: value1.subdistrict,
+                  label: value1.institutionName,
+                });
+              });
+            }
+          });
+        }
+      });
+    },
     handleRemove() {},
+    quhua(e) {
+      this.district = e;
+    },
     searchList() {
+      if (this.district) {
+        this.queryParms.district = this.district;
+      }
       this.searchBefore = { ...this.searchBefore, ...this.queryParms };
       this.getList();
     },
@@ -363,6 +433,8 @@ export default {
         pageNum: 1,
       };
       this.queryParms.year = "";
+      // this.district = [];
+      this.queryParms.uscCode = "";
       this.getList();
     },
     //获取列表
@@ -407,6 +479,7 @@ export default {
       this.headerText = "修改";
       getEnterprise(e.id).then((res) => {
         this.form = res.data;
+        this.queryParmsdistrict = this.form.district
         this.dialogVisible = true;
         this.$nextTick(() => {
           this.$refs.form1.clearValidate();
@@ -415,6 +488,18 @@ export default {
     },
     //保存
     confirm() {
+      if (this.queryParmsdistrict) {
+        if (this.queryParmsdistrict.length == 1) {
+          this.form.district = this.queryParmsdistrict[0];
+        } else if (
+          this.queryParmsdistrict.length == 2 &&
+          this.queryParmsdistrict[0] == this.queryParmsdistrict[1]
+        ) {
+          this.form.district = this.queryParmsdistrict[0];
+        } else {
+          this.form.district = this.queryParmsdistrict[1];
+        }
+      }
       this.$refs.form1.validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue
index 26885f3..1ce54f0 100644
--- a/src/views/yingji/home.vue
+++ b/src/views/yingji/home.vue
@@ -29,20 +29,12 @@
             </el-date-picker>
           </div>
         </div>
-        <div class="inputs">
+        <!-- <div class="inputs">
           <div class="navText" style="margin-left: 10px">区划:</div>
           <div>
-            <el-cascader
-              size="mini"
-              v-model="deptName"
-              placeholder="请选择"
-              :options="xzList"
-              :props="props"
-              :disabled="isNoneDivision"
-            >
-            </el-cascader>
+            <executive @quhua="quhua"></executive>
           </div>
-        </div>
+        </div> -->
         <div class="export" @click="searchList">
           <span>搜索</span>
         </div>
@@ -92,13 +84,13 @@
           :row-class-name="tableRowClassName"
         >
           <el-table-column
-            prop="deptName"
+            prop="institutionName"
             label="行政区划"
             header-align="center"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               {{ scope.row.deptName }}
-            </template>
+            </template> -->
           </el-table-column>
           <!-- <el-table-column prop="deptName" label="区县" header-align="center">
             <template slot-scope="scope">
@@ -106,13 +98,13 @@
             </template>
           </el-table-column> -->
           <el-table-column
-            prop="keyPlan"
+            prop="enterpriseCount"
             label="省重点计划数"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="keyCompleted"
+            prop="plannedEnterpriseCount"
             label="省重点完成数"
             header-align="center"
           >
@@ -123,17 +115,17 @@
             header-align="center"
           >
             <template slot-scope="scope">
-              {{ scope.row.percentageCompleted }}%
+              {{ scope.row.a ||0 }}%
             </template>
           </el-table-column>
           <el-table-column
-            prop="nonKeyPlan"
+            prop="planneKeyEnterpriseCount"
             label="非重点计划数"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="nonKeyCompleted"
+            prop="remainingKeyEnterpriseCount"
             label="非重点完成数"
             header-align="center"
           >
@@ -144,7 +136,7 @@
             header-align="center"
           >
             <template slot-scope="scope">
-              {{ scope.row.percentageNonCompleted }}%
+              {{ scope.row.a ||0}}%
             </template>
           </el-table-column>
           <el-table-column
@@ -152,17 +144,24 @@
             label="合计计划数"
             header-align="center"
           >
+          <template slot-scope="scope">
+              {{ scope.row.enterpriseCount + scope.row.planneKeyEnterpriseCount  }}
+            </template>
           </el-table-column>
           <el-table-column label="合计完成数" header-align="center">
             <template slot-scope="scope">
-              {{ scope.row.keyCompleted + scope.row.nonKeyCompleted }}
+              {{ scope.row.remainingKeyEnterpriseCount + scope.row.plannedEnterpriseCount }}
             </template>
           </el-table-column>
           <el-table-column label="合计完成率" header-align="center">
             <template slot-scope="scope">
-              {{
+              <!-- {{
                 scope.row.percentageCompleted +
                 scope.row.percentageNonCompleted
+              }}% -->
+              {{
+                scope.row.percentageCompleted +
+                scope.row.percentageNonCompleted || 0
               }}%
             </template>
           </el-table-column>
@@ -182,8 +181,8 @@ import completePlan from "./echarts/completePlan";
 import finishRate from "./echarts/finishRate";
 import executionPlan from "./echarts/executionPlan";
 import myPagination from "@/views/components/myPagination/index";
-import { workStatistics, xzTree } from "@/api/yingji/keyEnterprise.js";
-import { mapState } from "vuex";
+import { workStatistics, xzTree,planeEnTree } from "@/api/yingji/keyEnterprise.js";
+import executive from "./echarts/executive";
 
 export default {
   data() {
@@ -230,35 +229,27 @@ export default {
       load1: false,
       total: 0,
       tableData: [
-        {
-          deptName:'苏州市',
-          keyPlan:10,
-          keyCompleted:5,
-          percentageCompleted:50,
-          nonKeyPlan:10,
-          nonKeyCompleted:5,
-          percentageNonCompleted:50,
-          totalPlanCount:20,
-        }
+        // {
+        //   deptName: "苏州市",
+        //   keyPlan: 10,
+        //   keyCompleted: 5,
+        //   percentageCompleted: 50,
+        //   nonKeyPlan: 10,
+        //   nonKeyCompleted: 5,
+        //   percentageNonCompleted: 50,
+        //   totalPlanCount: 20,
+        // },
       ],
       //===
       beforeParams: {
-        pageSize: 10,
-        pageNum: 1,
+        // pageSize: 10,
+        // pageNum: 1,
       },
       form: {
         deptName: "",
         plannedYear: "",
       },
-      deptName: [],
-      xzList: [],
-      props: {
-        checkStrictly: true,
-        value: "value",
-        label: "label",
-        children: "children",
-      },
-      isNoneDivision: false,
+      deptName: '',
     };
   },
   components: {
@@ -266,53 +257,32 @@ export default {
     finishRate,
     executionPlan,
     myPagination,
+    executive,
   },
-  computed: {
-    ...mapState({
-      //根据存储的dept.parentId判断是哪个等级
-      dept: (state) => state.user.dept,
-    }),
-  },
+
   created() {
-    // this.getTree();
-    // this.getHomeList();
+    this.getHomeList();
   },
   mounted() {},
   methods: {
-    getTree() {
-      xzTree().then((res1) => {
-        if (this.dept.parentId == 0) {
-          res1.data.forEach((value, index) => {
-            this.xzList.push({
-              value: value.county,
-              label: value.institutionName,
-              children: [],
-            });
-            if (value.children.length > 0) {
-              value.children.forEach((value1, index1) => {
-                this.xzList[index].children.push({
-                  value: value1.subdistrict,
-                  label: value1.institutionName,
-                });
-              });
-            }
-          });
-        }
-      });
+    quhua(e) {
+      console.log(e);
+      this.deptName = e;
     },
     searchList() {
       if (this.deptName) {
-        this.form.deptName = this.deptName[0];
+        this.form.deptName = this.deptName;
       }
+      console.log(this.form);
       this.beforeParams = { ...this.beforeParams, ...this.form };
       this.getHomeList();
     },
     getHomeList() {
       this.load1 = true;
-      workStatistics(this.beforeParams).then((res) => {
+      planeEnTree(this.beforeParams).then((res) => {
         this.load1 = false;
-        this.tableData = res.data.list;
-        this.total = res.data.total;
+        this.tableData = res.data;
+        // this.total = res.data.total;
       });
     },
     pagesChange(e) {