diff --git a/src/api/yingji/index.js b/src/api/yingji/index.js
index e1ea78a..ca5328a 100644
--- a/src/api/yingji/index.js
+++ b/src/api/yingji/index.js
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-11 15:38:21
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-25 13:17:19
+ * @LastEditTime: 2023-09-27 09:30:39
  */
 import request from '@/utils/request'
 
@@ -63,4 +63,27 @@ export default {
       params
     });
   },
+  // 查看计划明细
+  planmx(data){
+    return request({
+      url: `/pharmaceuticals/bPlanEnterprise/planmx`,
+      method:'post',
+      data,
+    });
+  },
+  // 查询计划企业列表
+  bPlanEnterpriseList(){
+    return request({
+      url: `/pharmaceuticals/bPlanEnterprise/list`,
+      method:'get',
+    });
+  },
+  // 根据行政区划查询重点企业数量
+  getBydistrict(params){
+    return request({
+      url: `/pharmaceuticals/bKeyEnterprise/getBydistrict`,
+      method:'get',
+      params
+    });
+  },
 };
\ No newline at end of file
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index fe72a4c..62d9cad 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -69,8 +69,8 @@
               <div class="select-span">行业类型:</div>
               <el-select v-model="form.indusTypeClass" placeholder="请选择">
                 <el-option
-                  v-for="item in listThree"
-                  :key="item.dictValue"
+                  v-for="(item,index) in listThree"
+                  :key="index"
                   :label="item.dictLabel"
                   :value="item.dictValue"
                 >
@@ -81,7 +81,7 @@
               <div class="select-span">是否重点:</div>
               <el-select v-model="form.isPoint" placeholder="请选择">
                 <el-option label="是" value="1"></el-option>
-                <el-option label="否" value="0"></el-option>
+                <el-option label="否" value="2"></el-option>
               </el-select>
             </div>
             <div class="select-input">
@@ -202,7 +202,7 @@
                     :class="scope.row.isPoint == '1' ? 'isStyle' : ''"
                   >
                     <span v-if="scope.row.isPoint == '1'">是</span>
-                    <span v-if="scope.row.isPoint == '0'">否</span>
+                    <span v-if="scope.row.isPoint == '2'">否</span>
                   </div>
                 </template>
               </el-table-column>
@@ -334,7 +334,7 @@ export default {
       loading: false,
       isamend: false,
       amendId: "",
-      // count: 0,
+      count: 0,
       // unCount: 0,
       // unselected: 0,
       selectList: [],
@@ -346,6 +346,20 @@ export default {
       dept: (state) => state.user.dept,
     }),
   },
+  watch:{
+    tableData:{
+      handler(newData,oldData){
+        newData.map((item)=>{
+          if(item.isPoint == 1) {
+            this.$nextTick(() => {
+              this.$refs.multipleTable.toggleRowSelection(item,false);
+            });
+          }
+        })
+      },
+      deep:true,
+    }
+  },
   methods: {
     // 搜索
     filtrate() {
@@ -359,11 +373,11 @@ export default {
         if(this.form.subdistrict.length > 0){
           if(this.form.subdistrict.length == 2) {
             this.form.subdistrict = this.form.subdistrict[1]
-            this.subdistrict = this.form.subdistrict.slice(0, 11);
+            this.subdistrict = this.form.subdistrict.slice(1, 11);
             obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
           } else if(this.form.subdistrict.length == 1) {
             this.form.subdistrict = this.form.subdistrict[0]
-            this.subdistrict = this.form.subdistrict.slice(0, 7);
+            this.subdistrict = this.form.subdistrict.slice(1, 8);
             obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
           }
         } else {
@@ -371,11 +385,11 @@ export default {
         }
       } else {
         // 不是苏州市是区县
-        if(this.dept.parentId == 100) {
-          this.subdistrict = this.form.subdistrict.slice(0, 7);
+        if(this.dept.ancestors.split(',').length == 2) {
+          this.subdistrict = this.form.subdistrict.slice(1, 8);
           obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
-        } else if(this.dept.parentId == 101){
-          this.subdistrict = this.form.subdistrict.slice(0, 11);
+        } else if(this.dept.ancestors.split(',').length == 3){
+          this.subdistrict = this.form.subdistrict.slice(1, 11);
           obj = { ...this.pages, ...this.form,subdistrict:this.subdistrict };
         }
       }
@@ -419,41 +433,41 @@ export default {
       return row.unselected;
     },
     // 选中企业的获取
-    // async bPlanEnterprise() {
-    //   let count = 0;
-    //   let data = await this.$api.yingji.bPlanEnterprise();
-    //   this.selectList = data.data;
-    //   console.log(data)
-    //   data.data.map((item) => {
-    //     item["uscCode"] = item.enterpriseId;
-    //     this.$nextTick(() => {
-    //       this.$refs.multipleTable.toggleRowSelection(item, false);
-    //     });
-    //     if (item.isPoint == 1) {
-    //       count += 1;
-    //     }
-    //   });
-    //   console.log(count,'count')
-    //   this.unselected = count;
-    // },
+    async bPlanEnterprise() {
+      let count = 0;
+      let data = await this.$api.yingji.bPlanEnterpriseList();
+      this.selectList = data.data;
+      console.log(data)
+      data.data.map((item) => {
+        item["uscCode"] = item.enterpriseId;
+        this.$nextTick(() => {
+          this.$refs.multipleTable.toggleRowSelection(item, false);
+        });
+        if (item.isPoint == '1') {
+          count += 1;
+        }
+      });
+      // console.log(count,'count')
+      this.unselected = count;
+    },
+    // 乡镇获取企业重点总数
+    async gettownNumbers(){
+      let data = await this.$api.yingji.getBydistrict({district:this.form.subdistrict})
+      this.count = data.data;
+    },
     // 打开
     async open(item,dept) {
       this.dialogVisible = true;
       // this.dept = dept
       let data = await this.$api.yingji.tree(); // 行政区划
       this.commentData(data.data,dept);
+      this.bPlanEnterprise();
       this.filtrate()
       if (item == "newlyIncreased") {
         // 判断如若是镇级即将所有重点企业全选
-        // if(dept.parentId == 101){
-        //   this.tableData.map((item)=>{
-        //     if(item.isPoint == 1) {
-        //       this.$nextTick(() => {
-        //         this.$refs.multipleTable.toggleRowSelection(item);
-        //       });
-        //     }
-        //   })
-        // }
+        if(dept.ancestors.split(',').length == 3){
+          this.gettownNumbers();
+        }
         // this.getTable(this.pages);
       } else {
         this.amendId = item.id;
@@ -520,8 +534,14 @@ export default {
     },
     // 页码，当前页切换事件
     pagesChange(pages) {
-      this.getTable(pages);
       this.pages = pages;
+      console.log(this.form)
+      if(this.dept.ancestors.split(',').length == 2){
+        this.subdistrict = this.form.subdistrict.slice(1, 8);
+      } else if(this.dept.ancestors.split(',').length == 3){
+        this.subdistrict = this.form.subdistrict.slice(1, 11);
+      }
+      this.getTable({...pages,...this.form,subdistrict:this.subdistrict});
     },
     // 选中的数据
     handleSelectionChange(val) {
@@ -557,14 +577,14 @@ export default {
           this.$message.error("请至少选择一家企业");
           return;
         }
-        // if (this.dept.parentId == 101) {
-        //   if (this.count == this.unselected + keyCount) {
-        //     this.nextStep = true;
-        //     this.nextText = "发布计划";
-        //   } else {
-        //     this.$message.error("请将重点企业全选");
-        //   }
-        // } 
+        if (this.dept.ancestors.split(',').length == 3) {
+          if (this.count == this.unselected + keyCount) {
+            this.nextStep = true;
+            this.nextText = "发布计划";
+          } else {
+            this.$message.error("请将重点企业全选");
+          }
+        } 
         else {
           this.nextStep = true;
           this.nextText = "发布计划";
@@ -613,6 +633,8 @@ export default {
                   type: "success",
                 });
                 this.Close("newsuccess");
+              } else {
+                downloadLoadingInstance.close();
               }
             }
           } else {
@@ -643,7 +665,7 @@ export default {
         }
       })
       this.listOne = item
-      if(dept.parentId == 100) {
+      if(dept.ancestors.split(',').length == 2) {
         this.listOne = this.listOne.filter((item)=>{
           return item.institutionName == dept.deptName
         })
@@ -655,7 +677,7 @@ export default {
           }
         })
         this.disabled = true;
-      } else if(dept.parentId == 101) {
+      } else if(dept.ancestors.split(',').length == 3) {
         this.listOne.map((item)=>{
           if(item.institutionName == dept.deptName) {
             this.form.subdistrict = item.subdistrict
@@ -791,7 +813,7 @@ export default {
         }
         ::v-deep .el-select {
           background-color: transparent;
-          width: 160px;
+          width: 180px;
           .el-input__inner {
             height: 33px;
           }
diff --git a/src/views/components/dialogInfo/index.vue b/src/views/components/dialogInfo/index.vue
index 0e3a7b2..57d624f 100644
--- a/src/views/components/dialogInfo/index.vue
+++ b/src/views/components/dialogInfo/index.vue
@@ -6,7 +6,7 @@
     :close-on-click-modal="false"
     append-to-body
     custom-class="dialog-boxed"
-    width="70%"
+    width="60%"
   >
     <div class="dialog-slot">
       <div class="closeClick">
@@ -19,7 +19,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"
@@ -39,16 +39,388 @@
   </el-dialog>
 </template>
 <script>
+import { businessList } from "@/api/yingji/keyEnterprise";
 export default {
   data() {
     return {
-      detailLoad:[]
+      listDes: [
+        {
+          eng: "bizAddr",
+          label: "生产经营地址",
+          value: "123",
+        },
+        {
+          eng: "bossEmail",
+          label: "主要负责人电子邮箱",
+          value: "456",
+        },
+        {
+          eng: "bossMobtel",
+          label: "主要负责人移动电话",
+          value: "",
+        },
+        {
+          eng: "bossTel",
+          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: "是否开展双重预防机制",
+          value: "",
+        },
+        {
+          eng: "ecoTypeLarge",
+          label: "经济类型大类",
+          value: "",
+        },
+        {
+          eng: "ecoTypeSmall",
+          label: "经济类型小类",
+          value: "",
+        },
+        {
+          eng: "employeeNum",
+          label: "从业人员数量",
+          value: "",
+        },
+        {
+          eng: "enterColorChart",
+          label: "企业分色图",
+          value: "",
+        },
+        {
+          eng: "entprId",
+          label: "企业ID",
+          value: "",
+        },
+        {
+          eng: "entprName",
+          label: "企业名称",
+          value: "",
+        },
+        {
+          eng: "entprPlaneGragh",
+          label: "企业平面图",
+          value: "",
+        },
+        {
+          eng: "floorArea",
+          label: "占地面积（㎡）",
+          value: "",
+        },
+        {
+          eng: "fullEmegNum",
+          label: "专职应急管理人员数量",
+          value: "",
+        },
+        {
+          eng: "fullSafety",
+          label: "是否有专职安全人员",
+          value: "",
+        },
+        {
+          eng: "fullSafetyNum",
+          label: "专职安全生产管理人员数量",
+          value: "",
+        },
+        {
+          eng: "gridCode",
+          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: "是否存在重大危险源",
+          value: "",
+        },
+        {
+          eng: "majorHazardLevel",
+          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: "统一社会信用代码",
+          value: "",
+        },
+      ],
+      dialogVisible:false,
     }
   },
   methods:{
+    open(item) {
+      console.log(item)
+      this.dialogVisible = true;
+    },
+    Close() {
+      this.dialogVisible = false;
+    },
+    getList(){
+      businessList(this.searchBefore).then((res) => {
+        this.tableData = res.data.list;
+        this.total = res.data.total;
+      });
+    }
   },
 }
 </script>
 <style lang="scss" scoped>
-
+.dialog-slot {
+  .closeClick {
+    position: absolute;
+    top: 0;
+    right: 0;
+    padding: 10px 20px;
+    width: 100%;
+    z-index: 1000;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    text-align: center;
+    background: #f8f9fa;
+    box-shadow: 0px 1px 0px 0px #dbe0e8;
+    background-color: #e0eaf8;
+    img {
+      width: 18px;
+      height: 18px;
+      cursor: pointer;
+    }
+    .newplan {
+      display: flex;
+      align-items: center;
+      .line {
+        margin-right: 10px;
+        width: 5px;
+        height: 16px;
+        background-color: #1e70de;
+      }
+      .span {
+        font-size: 16px;
+        font-family: "Alibaba PuHuiTi";
+        font-weight: bold;
+        color: #1e70de;
+      }
+    }
+  }
+}
+::v-deep .el-descriptions-row th {
+  width: 20% !important;
+  font-size: 14px;
+  font-family: "Alibaba PuHuiTi";
+  font-weight: 400;
+}
+::v-deep .el-descriptions-row td {
+  width: 30% !important;
+  font-size: 14px;
+  font-family: "Alibaba PuHuiTi";
+  font-weight: 400;
+}
 </style>
diff --git a/src/views/components/dialogTwo/index.vue b/src/views/components/dialogTwo/index.vue
index 94c2655..9ae6db7 100644
--- a/src/views/components/dialogTwo/index.vue
+++ b/src/views/components/dialogTwo/index.vue
@@ -1,141 +1,148 @@
 <template>
-  <el-dialog
-    :visible.sync="dialogVisible"
-    :show-close="false"
-    :destroy-on-close="true"
-    :close-on-click-modal="false"
-    append-to-body
-    custom-class="dialog-boxed"
-    width="70%"
-  >
-    <div class="dialog-slot">
-      <div class="closeClick">
-        <div class="newplan">
-          <div class="line"></div>
-          <div class="span">计划详情</div>
+  <div>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :show-close="false"
+      :destroy-on-close="true"
+      :close-on-click-modal="false"
+      append-to-body
+      custom-class="dialog-boxed"
+      width="70%"
+    >
+      <div class="dialog-slot">
+        <div class="closeClick">
+          <div class="newplan">
+            <div class="line"></div>
+            <div class="span">计划详情</div>
+          </div>
+          <img src="@/assets/images/close.png" alt="" @click="Close" />
         </div>
-        <img src="@/assets/images/close.png" alt="" @click="Close" />
-      </div>
-      <div class="planInfo">
-        <div class="plan-title">
-          <div class="item">
-            <div class="year">
-              <div class="year-span">年份:</div>
-              <el-date-picker
-                v-model="form.plannedYear"
-                type="month"
-                format="yyyy-MM"
-                :clearable="false"
-                value-format="yyyy-MM"
-                placeholder="请选择年份">
-              </el-date-picker>
+        <div class="planInfo">
+          <div class="plan-title">
+            <div class="item">
+              <div class="year">
+                <div class="year-span">年份:</div>
+                <el-date-picker
+                  v-model="form.plannedYear"
+                  type="month"
+                  format="yyyy-MM"
+                  :clearable="false"
+                  value-format="yyyy-MM"
+                  placeholder="请选择年份">
+                </el-date-picker>
+              </div>
+              <div class="area">
+                <div class="area-span">区划:</div>
+                <el-cascader
+                  v-model="form.district"
+                  :disabled="disabled"
+                  placeholder="请选择"
+                  :options="options"
+                  :props="props"
+                  @change="handleChange"></el-cascader>
+              </div>
             </div>
-            <div class="area">
-              <div class="area-span">区划:</div>
-              <el-cascader
-                v-model="form.district"
-                :disabled="disabled"
-                placeholder="请选择"
-                :options="options"
-                :props="props"
-                @change="handleChange"></el-cascader>
+            <div class="item">
+              <div class="export" @click="exportFile">
+                <img src="@/assets/images/export.png" alt="">
+                <span>导出excel</span>
+              </div>
             </div>
           </div>
-          <div class="item">
-            <div class="export" @click="exportFile">
-              <img src="@/assets/images/export.png" alt="">
-              <span>导出excel</span>
+          <!-- <div class="plan-content">
+            <div class="item-two">
+              <div>计划内容：</div>
+              <div class="content">{{ content }}</div>
             </div>
-          </div>
+            <div class="item-two">
+              <div>备注：</div>
+              <div class="content">{{ remark ?remark:'暂无备注'}}</div>
+            </div>
+          </div> -->
         </div>
-        <!-- <div class="plan-content">
-          <div class="item-two">
-            <div>计划内容：</div>
-            <div class="content">{{ content }}</div>
-          </div>
-          <div class="item-two">
-            <div>备注：</div>
-            <div class="content">{{ remark ?remark:'暂无备注'}}</div>
-          </div>
-        </div> -->
-      </div>
-      <div class="tables" v-loading="loading">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          :border="false"
-          ref="multipleTable"
-          tooltip-effect="light"
-          :row-class-name="tableRowClassName"
-        >
-          <el-table-column
-            prop="entprName"
-            label="计划年月"
-            show-overflow-tooltip
-            header-align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="subdistrict"
-            label="行政区划"
-            show-overflow-tooltip
-            header-align="center"
+        <div class="tables" v-loading="loading">
+          <el-table
+            :data="tableData"
+            style="width: 100%"
+            :border="false"
+            ref="multipleTable"
+            tooltip-effect="light"
+            :row-class-name="tableRowClassName"
           >
-          </el-table-column>
-          <el-table-column
-            prop="entprName"
-            label="企业名称"
-            show-overflow-tooltip
-            header-align="center"
-          >
-          </el-table-column>
-          <!-- <el-table-column
-            prop="address"
-            label="企业类型"
-            show-overflow-tooltip
-            header-align="center"
-          >
-          </el-table-column> -->
-          <el-table-column
-            prop="uscCode"
-            label="创建时间"
-            show-overflow-tooltip
-            header-align="center"
-          >
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <div class="tabs-btns">
-                <div class="look" @click="look(scope.row)">
-                  <img src="@/assets/images/look.png" alt="">
-                  <span>查看</span>
-                </div>
-                <div class="change" @click="change(scope.row)">
-                  <img src="@/assets/images/change.png" alt="">
-                  <span>修改</span>
-                </div>
-                <div class="delete" @click="deleteItem(scope.row)">
-                  <img src="@/assets/images/delete.png" alt="">
-                  <span>删除</span>
+            <el-table-column
+              prop="plannedYear"
+              label="计划年月"
+              show-overflow-tooltip
+              header-align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="district"
+              label="行政区划"
+              show-overflow-tooltip
+              header-align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              prop="entprName"
+              label="企业名称"
+              show-overflow-tooltip
+              header-align="center"
+            >
+            </el-table-column>
+            <!-- <el-table-column
+              prop="address"
+              label="企业类型"
+              show-overflow-tooltip
+              header-align="center"
+            >
+            </el-table-column> -->
+            <el-table-column
+              prop="createTime"
+              label="创建时间"
+              show-overflow-tooltip
+              header-align="center"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime.split(' ')[0] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <div class="tabs-btns">
+                  <div class="look" @click="look(scope.row)">
+                    <img src="@/assets/images/look.png" alt="">
+                    <span>查看</span>
+                  </div>
+                  <div class="change" @click="change(scope.row)">
+                    <img src="@/assets/images/change.png" alt="">
+                    <span>修改</span>
+                  </div>
+                  <div class="delete" @click="deleteItem(scope.row)">
+                    <img src="@/assets/images/delete.png" alt="">
+                    <span>删除</span>
+                  </div>
                 </div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="pagination">
-        <my-pagination
-          :total="tableData.length"
-          @pagesChange="pagesChange"
-        ></my-pagination>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="pagination">
+          <my-pagination
+            :total="tableData.length"
+            @pagesChange="pagesChange"
+          ></my-pagination>
+        </div>
       </div>
-    </div>
-  </el-dialog>
+    </el-dialog>
+    <dialog-info ref="dialoginfo"></dialog-info>
+  </div>
 </template>
 <script>
 import myPagination from "@/views/components/myPagination/index.vue";
+import dialogInfo from "@/views/components/dialogInfo/index.vue";
 export default {
-  components: { myPagination },
+  components: { myPagination ,dialogInfo},
   data() {
     return {
       dialogVisible: false,
@@ -162,12 +169,12 @@ export default {
   },
   methods: {
     async open(item,dept) {
-      console.log(dept)
+      // console.log(dept)
       this.dept = dept
       this.dialogVisible = true;
-      let data = await this.$api.yingji.tree();
-      this.commentData(data.data,dept)
-      // this.getList(item);
+      // let data = await this.$api.yingji.tree();
+      // this.commentData(data.data,dept)
+      this.getList(item);
     },
     Close() {
       this.dialogVisible = false;
@@ -204,7 +211,7 @@ export default {
     // 获取列表
     async getList(item) {
       this.loading = true;
-      let data = await this.$api.yingji.bPlanManageTwo(item.id);
+      let data = await this.$api.yingji.planmx(this.pages);
       if (data.code == 200) {
         this.loading = false;
       }
@@ -217,7 +224,7 @@ export default {
     },
     // 查看
     look(row){
-
+      this.$refs.dialoginfo.open(row);
     },
     // 修改
     change(row){
@@ -502,7 +509,7 @@ export default {
         .look,.change,.delete {
           display: flex;
           align-items: center;
-          // margin-right: 30px;
+          margin-right: 30px;
           cursor: pointer;
           img {
             width: 20px;
diff --git a/src/views/yingji/planManage.vue b/src/views/yingji/planManage.vue
index 09218ae..29c943a 100644
--- a/src/views/yingji/planManage.vue
+++ b/src/views/yingji/planManage.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-26 16:02:57
+ * @LastEditTime: 2023-09-27 10:55:54
 -->
 <template>
     <div class="plan-management">
@@ -22,21 +22,22 @@
             </el-date-picker>
           </div>
           <div class="area">
-            <div class="area-span">执法计划情况统计表</div>
-            <!-- <el-cascader
+            <!-- <div class="area-span">执法计划情况统计表</div> -->
+            <div class="area-span">行政区划:</div>
+            <el-cascader
               v-model="form.district"
               :disabled="disabled"
               placeholder="请选择"
               :options="options"
               :props="props"
-              @change="handleChange"></el-cascader> -->
+              @change="handleChange"></el-cascader>
           </div>
         </div>
         <div class="btns">
-          <!-- <div class="export" @click="exportFile">
+          <div class="export" @click="exportFile">
             <img src="@/assets/images/export.png" alt="">
             <span>导出excel</span>
-          </div> -->
+          </div>
           <div class="newProject" @click="newProject">
             <img src="@/assets/images/newProject.png" alt="">
             <span>新增计划</span>
@@ -46,7 +47,7 @@
       </div>
       <div class="plan-bottomBox">
         <div class="tables">
-          <!-- <el-table
+          <el-table
             :data="tableData"
             :border="false"
             :height="484"
@@ -84,12 +85,12 @@
               header-align="center"
             >
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="keyCount"
               label="省重点数"
               header-align="center"
             >
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="createTime"
               label="创建时间"
@@ -121,8 +122,8 @@
                 </div>
               </template>
             </el-table-column>
-          </el-table> -->
-          <el-table
+          </el-table>
+          <!-- <el-table
             v-if="refreshTable"
             v-loading="loading"
             :data="tableData"
@@ -134,7 +135,7 @@
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
           >
           <el-table-column prop="district" label="行政区划" header-align="center" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="plannedYear" label="企业总数" header-align="center"></el-table-column>
+          <el-table-column prop="amount" label="企业总数" header-align="center"></el-table-column>
             <el-table-column prop="planNumb" label="已计划数" header-align="center"></el-table-column>
             <el-table-column prop="keyCount" label="已计划省重点数" header-align="center"></el-table-column>
             <el-table-column prop="keyCount" label="剩余重点数" header-align="center"></el-table-column>
@@ -145,18 +146,18 @@
                     <img src="@/assets/images/look.png" alt="">
                     <span>查看</span>
                   </div>
-                  <!-- <div class="change" @click="change(scope.row)">
+                  <div class="change" @click="change(scope.row)">
                     <img src="@/assets/images/change.png" alt="">
                     <span>修改</span>
                   </div>
                   <div class="delete" @click="deleteItem(scope.row)">
                     <img src="@/assets/images/delete.png" alt="">
                     <span>删除</span>
-                  </div> -->
+                  </div>
                 </div>
               </template>
             </el-table-column>
-          </el-table>
+          </el-table> -->
         </div>
         <div class="pagination">
           <my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
@@ -189,35 +190,41 @@
         },
         tableData: [{
           id: 1,
-          plannedYear: '2016-05-02',
-          district: '王小虎',
+          amount: '260',
+          district: '苏州市',
           planNumb: '200',
+          keyCount:10,
           children: [{
               id: 31,
-              plannedYear: '2016-05-01',
-              district: '王小虎',
-              planNumb: '200'
+              amount: '220',
+              district: '吴中区',
+              planNumb: '30',
+              keyCount:10,
             }, {
               id: 32,
-              plannedYear: '2016-05-01',
-              district: '王小虎',
-              planNumb: '200'
+              amount: '200',
+              district: '姑苏区',
+              planNumb: '20',
+              keyCount:10,
           }]
         }, {
           id: 2,
-          plannedYear: '2016-05-04',
-          district: '王小虎',
-          planNumb: '200'
+          amount: '330',
+          district: '木渎镇',
+          planNumb: '200',
+          keyCount:10,
         }, {
           id: 256,
-          plannedYear: '2016-05-01',
-          district: '王小虎',
+          amount: '350',
+          district: '东山镇',
           planNumb: '200',
+          keyCount:10,
         }, {
           id: 257,
-          plannedYear: '2016-05-03',
-          district: '王小虎',
-          planNumb: '200'
+          amount: '300',
+          district: '吴江区',
+          planNumb: '200',
+          keyCount:10,
         }],
         pages:{
           pageSize:10,
@@ -244,7 +251,7 @@
           // console.log(newForm)
           // district = district[1]
           let obj = {...this.pages,district,plannedYear}
-          // this.getList(obj)
+          this.getList(obj)
         },
         deep:true,
       }
@@ -367,7 +374,7 @@
       // 获取list表
       async getList(pages){
         this.loading = true;
-        let res = await this.$api.yingji.bPlanManage('get',_,pages);
+        let res = await this.$api.yingji.planmx(pages);
         if(res.code == 200) {
           this.loading = false;
         }
@@ -419,7 +426,7 @@
       // })
       // let data = await this.$api.yingji.tree();
       // this.commentData(data.data,this.dept)
-      // this.getList(this.pages);
+      this.getList(this.pages);
     },
   }
   </script>
@@ -456,12 +463,18 @@
           justify-content: center;
           flex: 1;
           .area-span {
-            font-size: 20px;
+            // font-size: 20px;
+            // font-family: 'Alibaba PuHuiTi';
+            // font-weight: bold;
+            // color: #525966;
+            // line-height: 40px;
+            // margin-right: 100px;
+            font-size: 14px;
             font-family: 'Alibaba PuHuiTi';
-            font-weight: bold;
+            font-weight: 400;
             color: #525966;
             line-height: 40px;
-            margin-right: 100px;
+            margin-right: 10px;
           }
           ::v-deep .el-cascader {
             background-color: transparent;
@@ -590,7 +603,7 @@
           .look,.change,.delete {
             display: flex;
             align-items: center;
-            // margin-right: 30px;
+            margin-right: 30px;
             cursor: pointer;
             img {
               width: 20px;