diff --git a/src/api/yingji/keyEnterprise.js b/src/api/yingji/keyEnterprise.js
index fee0c54..2faf740 100644
--- a/src/api/yingji/keyEnterprise.js
+++ b/src/api/yingji/keyEnterprise.js
@@ -68,6 +68,13 @@ export function enforcingDetail(data) {
 
     })
 }
+//执法列表详情
+export function enforcingGet(id) {
+    return request({
+        url: `/pharmaceuticals/examine/${id}`,
+        method: 'get',
+    })
+}
 
 // 根据字段查询字典信息
 export function listDist(query) {
diff --git a/src/views/yingji/echarts/completePlan.vue b/src/views/yingji/echarts/completePlan.vue
index 8293b1f..8569695 100644
--- a/src/views/yingji/echarts/completePlan.vue
+++ b/src/views/yingji/echarts/completePlan.vue
@@ -1,5 +1,5 @@
 <template >
-  <div style="height: 100%; width: 100%" v-loading="load1">
+  <div style="height: 100%; width: 100%" >
     <div id="main1"></div>
   </div>
 </template>
@@ -21,7 +21,8 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.getData();
+      // this.getData();
+      this.initChart()
     });
   },
   methods: {
@@ -89,20 +90,20 @@ export default {
         yAxis: [
           {
             type: "category",
-            // data: [
-            //   "高新区",
-            //   "工业园区",
-            //   "相城区",
-            //   "姑苏区",
-            //   "吴中区",
-            //   "吴江区",
-            //   "昆山市",
-            //   "太仓市",
-            //   "常熟市",
-            //   "张家港市",
-            //   "苏州",
-            // ],
-            data: this.arr1,
+            data: [
+              "高新区",
+              "工业园区",
+              "相城区",
+              "姑苏区",
+              "吴中区",
+              "吴江区",
+              "昆山市",
+              "太仓市",
+              "常熟市",
+              "张家港市",
+              "苏州",
+            ],
+            // data: this.arr1,
             axisLabel: {
               // 超出指定长度显示省略号
               formatter: function (value) {
@@ -128,8 +129,8 @@ export default {
           },
           {
             type: "category",
-            // data: [33, 63, 115, 167, 210, 225, 245, 283, 300, 321, 1000],
-            data: this.arr2,
+            data: [33, 63, 115, 167, 210, 225, 245, 283, 300, 321, 1000],
+            // data: this.arr2,
             axisLabel: {
               formatter: function (value, index) {
                 return `{a|${value}}{b|家}`;
@@ -163,8 +164,8 @@ export default {
             label: {
               show: false, //是否显示标签
             },
-            // data: [63, 115, 167, 210, 225, 245, 283, 300, 321, 678, 1000],
-            data: this.arr2,
+            data: [63, 115, 167, 210, 225, 245, 283, 300, 321, 678, 1000],
+            // data: this.arr2,
             barWidth: 12,
             itemStyle: {
               color: {
diff --git a/src/views/yingji/echarts/executionPlan.vue b/src/views/yingji/echarts/executionPlan.vue
index 0142efb..72356e9 100644
--- a/src/views/yingji/echarts/executionPlan.vue
+++ b/src/views/yingji/echarts/executionPlan.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="load1" style="height: 100%; width: 100%">
+  <div  style="height: 100%; width: 100%">
     <div id="mains1"></div>
   </div>
 </template>
@@ -16,7 +16,8 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.getData();
+      // this.getData();
+      this.init();
     });
   },
   methods: {
@@ -68,20 +69,20 @@ export default {
         xAxis: [
           {
             type: "category",
-            data: this.arr1,
-            // data: [
-            //   "苏州",
-            //   "张家港市",
-            //   "常熟市",
-            //   "太仓市",
-            //   "昆山市",
-            //   "吴江区",
-            //   "吴中区",
-            //   "姑苏区",
-            //   "相城区",
-            //   "工业园区",
-            //   "高新区",
-            // ],
+            // data: this.arr1,
+            data: [
+              "苏州",
+              "张家港市",
+              "常熟市",
+              "太仓市",
+              "昆山市",
+              "吴江区",
+              "吴中区",
+              "姑苏区",
+              "相城区",
+              "工业园区",
+              "高新区",
+            ],
             axisTick: {
               show: false,
             },
@@ -136,8 +137,8 @@ export default {
               ]),
             },
             z: 100,
-            // data: [700, 400, 600, 300, 580, 250, 490, 200, 390, 460, 90],
-            data: this.arr2,
+            data: [700, 400, 600, 300, 580, 250, 490, 200, 390, 460, 90],
+            // data: this.arr2,
             //高亮的效果
             emphasis: {
               label: {
diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue
index 3c5af2c..bf6a226 100644
--- a/src/views/yingji/echarts/finishRate.vue
+++ b/src/views/yingji/echarts/finishRate.vue
@@ -1,5 +1,5 @@
 <template >
-  <div style="height: 100%; height: 100%" v-loading="load1">
+  <div style="height: 100%; height: 100%" >
     <div id="cakeBox"></div>
   </div>
 </template>
@@ -22,7 +22,8 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.getData();
+      // this.getData();
+      this.initChart();
     });
   },
   methods: {
@@ -102,22 +103,23 @@ export default {
               arrA += value.value;
             });
             const item = option.legend.data.find((item) => item.name === name);
-            return `{a|${name}}{b|${( item.value / arrA * 100)}%}`;
+            // return `{a|${name}}{b|${( item.value / arrA * 100)}%}`;
+            return `{a|${name}}{b|15%}`;
           },
           //将waiyuan的数据拿过来,就会只显示该外圆的数据
-          // data: [
-          //   { value: 15, name: "张家港市" },
-          //   { value: 10, name: "吴中区" },
-          //   { value: 8, name: "常熟市" },
-          //   { value: 10, name: "姑苏区" },
-          //   { value: 18, name: "太仓市" },
-          //   { value: 6, name: "相城区" },
-          //   { value: 10, name: "昆山市" },
-          //   { value: 4, name: "工业园区" },
-          //   { value: 10, name: "吴江区" },
-          //   { value: 5, name: "高新区" },
-          // ],
-          data: this.arr1,
+          data: [
+            { value: 15, name: "张家港市" },
+            { value: 10, name: "吴中区" },
+            { value: 8, name: "常熟市" },
+            { value: 10, name: "姑苏区" },
+            { value: 18, name: "太仓市" },
+            { value: 6, name: "相城区" },
+            { value: 10, name: "昆山市" },
+            { value: 4, name: "工业园区" },
+            { value: 10, name: "吴江区" },
+            { value: 5, name: "高新区" },
+          ],
+          // data: this.arr1,
         },
         series: [
           {
@@ -183,19 +185,19 @@ export default {
             labelLine: {
               show: false,
             },
-            // data: [
-            //   { value: 15, name: "张家港市" },
-            //   { value: 10, name: "吴中区" },
-            //   { value: 8, name: "常熟市" },
-            //   { value: 10, name: "姑苏区" },
-            //   { value: 18, name: "太仓市" },
-            //   { value: 6, name: "相城区" },
-            //   { value: 10, name: "昆山市" },
-            //   { value: 4, name: "工业园区" },
-            //   { value: 10, name: "吴江区" },
-            //   { value: 5, name: "高新区" },
-            // ],
-            data: this.arr1,
+            data: [
+              { value: 15, name: "张家港市" },
+              { value: 10, name: "吴中区" },
+              { value: 8, name: "常熟市" },
+              { value: 10, name: "姑苏区" },
+              { value: 18, name: "太仓市" },
+              { value: 6, name: "相城区" },
+              { value: 10, name: "昆山市" },
+              { value: 4, name: "工业园区" },
+              { value: 10, name: "吴江区" },
+              { value: 5, name: "高新区" },
+            ],
+            // data: this.arr1,
           },
         ],
       };
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 31fd816..b69d98c 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -25,7 +25,7 @@
           <div class="select-span">区划:</div>
           <el-cascader
             size="small"
-            v-model="form.district"
+            v-model="district"
             :options="compartment"
             :disabled="isNoneDivision"
             :props="props"
@@ -162,6 +162,7 @@ import {
   businessList,
   enforcingDetail,
   xzTree,
+  enforcingGet,
 } from "@/api/yingji/keyEnterprise.js";
 import { mapState } from "vuex";
 export default {
@@ -172,11 +173,10 @@ export default {
       tableData: [],
       loads: true,
       total: 0,
-      options: [],
-      props: {},
       //这个是点击搜索之前的值
+      district: [],
       form: {
-        district: [],
+        district: "",
         plannedYear: "",
         //检测状态
         checkStatus: "",
@@ -312,13 +312,17 @@ export default {
       //区划的禁用
       isNoneDivision: false,
       newQHList: [],
+      props: {
+        checkStrictly: true,
+        value: "value",
+        label: "label",
+        children: "children",
+      },
     };
   },
   created() {
     this.getList();
     this.xzList();
-    // console.log(this.dept);
-    console.log(this.form.district);
   },
   computed: {
     ...mapState({
@@ -327,11 +331,12 @@ export default {
     }),
   },
   methods: {
-    //判断等级然后去设置
-
     reset() {
-      this.form.plannedYear = "";
-      this.form.checkStatus = "";
+      this.form = {
+        district: "",
+        plannedYear: "",
+        checkStatus: "",
+      };
       this.searchBefore = {
         pageSize: 10,
         pageNum: 1,
@@ -345,79 +350,39 @@ export default {
 
     xzList() {
       xzTree().then((res) => {
-        console.log(res);
-        this.compartment = res.data;
-        this.filterComparment(this.compartment);
-        //市级
         if (this.dept.parentId == 0) {
-          this.isNoneDivision = false;
-        }
-        //区级
-        if (this.dept.parentId == 100) {
-          this.props = {
-            checkStrictly: true,
-            value: "county", //匹配响应数据中的id
-            label: "institutionName", //匹配响应数据中的name
-            children: "children",
-          };
-          let arr1 = this.newQHList.filter((value) => {
-            return value.institutionName == this.dept.deptName;
-          });
-          this.form.district.push(arr1[0].county);
-          this.isNoneDivision = true;
-        }
-        //镇级
-        if (this.dept.parentId == 101) {
-          this.props = {
-            checkStrictly: true,
-            value: "subdistrict", //匹配响应数据中的id
-            label: "institutionName", //匹配响应数据中的name
-            children: "children",
-          };
-          let arr1 = this.newQHList.filter((value) => {
-            return value.institutionName == this.dept.deptName;
+          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,
+                });
+              });
+            }
           });
-          this.form.district.push(null, arr1[0].subdistrict);
-          this.isNoneDivision = true;
         }
       });
     },
-    filterComparment(e) {
-      e.forEach((value, index) => {
-        this.newQHList.push(value);
-        if (value.children.length >= 1) {
-          this.filterComparment(value.children);
-        } else {
-          delete value.children;
-          return;
-        }
-      });
-    },
-
     shutDownDetail() {
       this.addShow = false;
     },
     look(e) {
       this.addShow = true;
       this.detailLoad = true;
-      businessList({ uscCode: e.enterpriseId, ...this.searchBefore }).then(
-        (res) => {
-          this.details = res.data.list[0];
-          this.detailLoad = false;
-          for (let key in this.details) {
-            this.listDes.forEach((value1, index1) => {
-              if (key == value1.eng) {
-                this.listDes[index1].value = this.details[key];
-                return;
-              }
-            });
-          }
-        }
-      );
+      enforcingGet(e.longId).then((res) => {
+        console.log(res);
+      });
     },
     searchList() {
-      console.log(this.form.district);
-      this.form.district = this.form.district[this.form.district.length - 1];
+      if (this.district) {
+        this.form.district = this.district[0];
+      }
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
     },
diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue
index 6df7bcd..3d1332e 100644
--- a/src/views/yingji/enterprise.vue
+++ b/src/views/yingji/enterprise.vue
@@ -5,10 +5,11 @@
         <div class="select-input">
           <div class="select-span">行政区划:</div>
           <el-cascader
-            v-model="form.subdistrict"
+            v-model="subdistrict"
             placeholder="请选择"
             :options="xzList"
             :props="props"
+            :disabled="isNoneDivision"
           >
           </el-cascader>
         </div>
@@ -110,6 +111,16 @@
           width="180"
           header-align="center"
         >
+          <template slot-scope="scope">
+            <div>
+              {{
+                filterTable(
+                  options.major_hazard_level,
+                  scope.row.majorHazardLevel
+                )
+              }}
+            </div>
+          </template>
         </el-table-column>
         <el-table-column
           prop="indusTypeClass"
@@ -119,18 +130,26 @@
         >
           <template slot-scope="scope">
             <div>
-              {{ scope.row.indusTypeClass!='null' ? scope.row.indusTypeClass : "" }}
+              {{
+                scope.row.indusTypeClass != "null"
+                  ? scope.row.indusTypeClass
+                  : ""
+              }}
             </div>
           </template>
         </el-table-column>
         <el-table-column
-          prop="enterColorChart"
+          prop="entprColor"
           label="企业分色"
           header-align="center"
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <div>
-              {{ scope.row.enterColorChart!='null' ? scope.row.enterColorChart : "" }}
+              {{
+                scope.row.enterColorChart != "null"
+                  ? scope.row.enterColorChart
+                  : ""
+              }}
             </div>
           </template>
         </el-table-column>
@@ -187,7 +206,7 @@
         </div>
         <div class="content">
           <div class="filtrate">
-            <el-descriptions :column="2" border v-loading="detailLoad">
+            <el-descriptions :column="2" border>
               <el-descriptions-item
                 :label="item.label"
                 v-for="(item, index) in listDes"
@@ -206,13 +225,14 @@
         </div>
       </div>
     </el-dialog>
-    
   </div>
 </template>
   
   <script>
 import myPagination from "@/views/components/myPagination/index.vue";
 import { businessList, listDist, xzTree } from "@/api/yingji/keyEnterprise";
+import { mapState } from "vuex";
+
 export default {
   components: { myPagination },
   name: "Order",
@@ -229,8 +249,10 @@ export default {
         uscCode: "",
       },
       props: {
-        value: "subdistrict",
-        label: "institutionName",
+        checkStrictly: true,
+        value: "value",
+        label: "label",
+        children: "children",
       },
       xzqh: "",
       searchBefore: {
@@ -265,12 +287,31 @@ export default {
           label: "主要负责人固定电话",
           value: "",
         },
+        {
+          eng: "businessScope",
+          label: "经营范围",
+          value: "",
+        },
+        {
+          eng: "contactEmail",
+          label: "电子邮箱",
+          value: "",
+        },
+        {
+          eng: "contactQq",
+          label: "联系QQ号码",
+          value: "",
+        },
+        {
+          eng: "contactTel",
+          label: "企业固定电话",
+          value: "",
+        },
         {
           eng: "cseNum",
           label: "注册安全工程师人员数量",
           value: "",
         },
-
         {
           eng: "doublePreven",
           label: "是否开展双重预防机制",
@@ -296,14 +337,24 @@ export default {
           label: "企业分色图",
           value: "",
         },
+        {
+          eng: "entprId",
+          label: "企业ID",
+          value: "",
+        },
         {
           eng: "entprName",
           label: "企业名称",
           value: "",
         },
+        {
+          eng: "entprPlaneGragh",
+          label: "企业平面图",
+          value: "",
+        },
         {
           eng: "floorArea",
-          label: "占地面积",
+          label: "占地面积（㎡）",
           value: "",
         },
         {
@@ -326,21 +377,78 @@ export default {
           label: "网格编码",
           value: "",
         },
+        {
+          eng: "gridEntprStatus",
+          label: "网格对企业的关停和恢复",
+          value: "",
+        },
+        {
+          eng: "groupCompName",
+          label: "集团公司名称",
+          value: "",
+        },
+        {
+          eng: "indusTypeClass",
+          label: "行业类别门类",
+          value: "",
+        },
+        {
+          eng: "indusTypeLagre",
+          label: "行业类别大类",
+          value: "",
+        },
+        {
+          eng: "indusTypeMiddle",
+          label: "行业类别中类",
+          value: "",
+        },
+        {
+          eng: "indusTypeSmall",
+          label: "行业类别小类",
+          value: "",
+        },
+        {
+          eng: "industryRefer",
+          label: "工贸涉及(专项治理类别)",
+          value: "",
+        },
         {
           eng: "infoYear",
           label: "数据年份",
           value: "",
         },
+
         {
           eng: "isPoint",
           label: "是否重点",
           value: "",
         },
+
+        {
+          eng: "latitudeGps",
+          label: "纬度（度） 84",
+          value: "",
+        },
         {
           eng: "legalPerson",
           label: "法定代表人",
           value: "",
         },
+        {
+          eng: "localSafetyAdmin",
+          label: "属地安监机构",
+          value: "",
+        },
+        {
+          eng: "longitudeGps",
+          label: "经度（度） 84",
+          value: "",
+        },
+        {
+          eng: "mainProduct",
+          label: "主要产品",
+          value: "",
+        },
         {
           eng: "majorHazardInstallations",
           label: "是否存在重大危险源",
@@ -351,11 +459,116 @@ export default {
           label: "重大危险源等级",
           value: "",
         },
+        {
+          eng: "operatingStatus",
+          label: "经营状态",
+          value: "",
+        },
+        {
+          eng: "parentCompName",
+          label: "母公司名称",
+          value: "",
+        },
+        {
+          eng: "partSafetyNum",
+          label: "兼职安全生产管理人员数量",
+          value: "",
+        },
         {
           eng: "regAddr",
           label: "注册地址",
           value: "",
         },
+        {
+          eng: "regCapi",
+          label: "注册资金（万元）",
+          value: "",
+        },
+        {
+          eng: "safetyDepart",
+          label: "是否有专门安全机构",
+          value: "",
+        },
+        {
+          eng: "safetyDepartDuty",
+          label: "安全管理机构职责",
+          value: "",
+        },
+        {
+          eng: "safetyDepartName",
+          label: "安全管理机构名称",
+          value: "",
+        },
+        {
+          eng: "safetyDepartNum",
+          label: "安全管理机构成员数量",
+          value: "",
+        },
+        {
+          eng: "safetyEmail",
+          label: "安全负责人电子邮箱",
+          value: "",
+        },
+        {
+          eng: "safetyManager",
+          label: "安全负责人",
+          value: "",
+        },
+        {
+          eng: "safetyMobtel",
+          label: "安全负责人移动电话",
+          value: "",
+        },
+        {
+          eng: "safetySupervisionLevel",
+          label: "安全监管等级",
+          value: "",
+        },
+        {
+          eng: "safetyTel",
+          label: "安全负责人固定电话",
+          value: "",
+        },
+        {
+          eng: "setupDate",
+          label: "成立日期",
+          value: "",
+        },
+        {
+          eng: "sourceData",
+          label: "数据来源",
+          value: "",
+        },
+        {
+          eng: "specialGovernance",
+          label: "专项治理类别",
+          value: "",
+        },
+        {
+          eng: "speclalOperationNum",
+          label: "特种作业人员数量",
+          value: "",
+        },
+        {
+          eng: "standLevel",
+          label: "标准化等级",
+          value: "",
+        },
+        {
+          eng: "stateOwed",
+          label: "是否为国有企业",
+          value: "",
+        },
+        {
+          eng: "supervisionLarge",
+          label: "行业监管大类",
+          value: "",
+        },
+        {
+          eng: "supervisionSmall",
+          label: "行业监管小类",
+          value: "",
+        },
         {
           eng: "uscCode",
           label: "统一社会信用代码",
@@ -364,41 +577,91 @@ export default {
       ],
       addShow: false,
       details: null,
-      detailLoad: true,
+      //==
+      isNoneDivision: false,
+      newQHList: [],
+      subdistrict: [],
+      isPointOption:[
+        {
+          dictValue:1,
+          dictLabel:'是'
+        },
+        {
+          dictValue:0,
+          dictLabel:'否'
+        },
+      ]
     };
   },
   created() {
     this.getList();
     this.getDict();
   },
+  computed: {
+    ...mapState({
+      //根据存储的dept.parentId判断是哪个等级
+      dept: (state) => state.user.dept,
+    }),
+  },
   methods: {
+    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;
+    },
     shutDownDetail() {
       this.addShow = false;
     },
     look(e) {
       this.addShow = true;
-      this.detailLoad = true;
-      businessList({ uscCode: e.enterpriseId, ...this.searchBefore }).then(
-        (res) => {
-          this.details = res.data.list[0];
-          this.detailLoad = false;
-          for (let key in this.details) {
-            this.listDes.forEach((value1, index1) => {
-              if (key == value1.eng) {
-                this.listDes[index1].value = this.details[key];
-                return;
-              }
-            });
+      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);
-        this.xzList = res1.data;
-        this.filterComparment(this.xzList);
-        console.log(this.xzList);
+        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,
+                });
+              });
+            }
+          });
+        }
       });
       listDist({
         list: "economic_categories,category,major_hazard_level,entpr_color",
@@ -406,26 +669,17 @@ export default {
         this.options = res.data;
       });
     },
-    filterComparment(e) {
-      e.forEach((value, index) => {
-        if (value.children.length >= 1) {
-          this.filterComparment(value.children);
-        } else {
-          delete value.children;
-          return;
-        }
-      });
-    },
+
     searchList() {
-      if (this.form.subdistrict) {
-        this.form.subdistrict = this.form.subdistrict[1];
+      if (this.subdistrict) {
+        this.form.subdistrict = this.subdistrict[0];
       }
       this.searchBefore = { ...this.searchBefore, ...this.form };
       this.getList();
     },
     chongzhiList() {
       this.form = {
-        subdistrict: [],
+        subdistrict: "",
         frimType: "",
         indusTypeClass: "",
         isPoint: "",
diff --git a/src/views/yingji/focusEnter.vue b/src/views/yingji/focusEnter.vue
index 4aa45cf..cc3bf87 100644
--- a/src/views/yingji/focusEnter.vue
+++ b/src/views/yingji/focusEnter.vue
@@ -23,15 +23,37 @@
             </el-date-picker>
           </div>
         </div>
+        <!-- <div class="select-input">
+          <div class="select-span">区划:</div>
+          <el-cascader
+            v-model="subdistrict"
+            placeholder="请选择"
+            :options="xzList"
+            :props="props"
+            :disabled="isNoneDivision"
+          >
+          </el-cascader>
+        </div> -->
+        <!-- <div class="input-input">
+          <div class="select-span">企业名称/统一社会信用代码:</div>
+          <el-input
+            v-model="form.uscCode"
+            placeholder="请输入企业名称/统一社会信用代码"
+          ></el-input>
+        </div> -->
       </div>
       <div style="display: flex">
-        <div class="export" @click="addkeys" style="background-color: #28b384;">
+        <div class="export" @click="addkeys" style="background-color: #28b384">
           <span>新增</span>
         </div>
         <div class="export" @click="searchList">
           <span>搜索</span>
         </div>
-        <div class="export" @click="chongzhiList" style="background-color: #FDAB5B;">
+        <div
+          class="export"
+          @click="chongzhiList"
+          style="background-color: #fdab5b"
+        >
           <span>重置</span>
         </div>
         <div class="export" style="background: #f71052" @click="deleteItem">
diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue
index 4e683d2..26885f3 100644
--- a/src/views/yingji/home.vue
+++ b/src/views/yingji/home.vue
@@ -32,12 +32,15 @@
         <div class="inputs">
           <div class="navText" style="margin-left: 10px">区划:</div>
           <div>
-            <el-input
-              v-model="form.deptName"
-              placeholder="请输入区划"
+            <el-cascader
               size="mini"
+              v-model="deptName"
+              placeholder="请选择"
+              :options="xzList"
+              :props="props"
+              :disabled="isNoneDivision"
             >
-            </el-input>
+            </el-cascader>
           </div>
         </div>
         <div class="export" @click="searchList">
@@ -97,11 +100,11 @@
               {{ scope.row.deptName }}
             </template>
           </el-table-column>
-          <el-table-column prop="deptName" label="区县" header-align="center">
+          <!-- <el-table-column prop="deptName" label="区县" header-align="center">
             <template slot-scope="scope">
               {{ scope.row.deptName.slice(scope.row.deptName.length - 1) }}级
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="keyPlan"
             label="省重点计划数"
@@ -119,7 +122,7 @@
             label="省重点完成率"
             header-align="center"
           >
-          <template slot-scope="scope">
+            <template slot-scope="scope">
               {{ scope.row.percentageCompleted }}%
             </template>
           </el-table-column>
@@ -140,7 +143,7 @@
             label="非重点完成率"
             header-align="center"
           >
-          <template slot-scope="scope">
+            <template slot-scope="scope">
               {{ scope.row.percentageNonCompleted }}%
             </template>
           </el-table-column>
@@ -157,7 +160,10 @@
           </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
+              }}%
             </template>
           </el-table-column>
         </el-table>
@@ -176,7 +182,9 @@ import completePlan from "./echarts/completePlan";
 import finishRate from "./echarts/finishRate";
 import executionPlan from "./echarts/executionPlan";
 import myPagination from "@/views/components/myPagination/index";
-import { workStatistics } from "@/api/yingji/keyEnterprise.js";
+import { workStatistics, xzTree } from "@/api/yingji/keyEnterprise.js";
+import { mapState } from "vuex";
+
 export default {
   data() {
     return {
@@ -221,7 +229,18 @@ export default {
       //======
       load1: false,
       total: 0,
-      tableData: [],
+      tableData: [
+        {
+          deptName:'苏州市',
+          keyPlan:10,
+          keyCompleted:5,
+          percentageCompleted:50,
+          nonKeyPlan:10,
+          nonKeyCompleted:5,
+          percentageNonCompleted:50,
+          totalPlanCount:20,
+        }
+      ],
       //===
       beforeParams: {
         pageSize: 10,
@@ -231,6 +250,15 @@ export default {
         deptName: "",
         plannedYear: "",
       },
+      deptName: [],
+      xzList: [],
+      props: {
+        checkStrictly: true,
+        value: "value",
+        label: "label",
+        children: "children",
+      },
+      isNoneDivision: false,
     };
   },
   components: {
@@ -239,14 +267,45 @@ export default {
     executionPlan,
     myPagination,
   },
+  computed: {
+    ...mapState({
+      //根据存储的dept.parentId判断是哪个等级
+      dept: (state) => state.user.dept,
+    }),
+  },
   created() {
-    this.getHomeList();
+    // this.getTree();
+    // 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,
+                });
+              });
+            }
+          });
+        }
+      });
+    },
     searchList() {
-      this.beforeParams = {...this.beforeParams,...this.form}
-      this.getHomeList()
+      if (this.deptName) {
+        this.form.deptName = this.deptName[0];
+      }
+      this.beforeParams = { ...this.beforeParams, ...this.form };
+      this.getHomeList();
     },
     getHomeList() {
       this.load1 = true;
@@ -257,9 +316,9 @@ export default {
       });
     },
     pagesChange(e) {
-      this.beforeParams.pageNum = e.pageNum
-      this.beforeParams.pageSize = e.pageSize
-      this.getHomeList()
+      this.beforeParams.pageNum = e.pageNum;
+      this.beforeParams.pageSize = e.pageSize;
+      this.getHomeList();
     },
     active(e) {
       this.activeIndex = e;