diff --git a/src/api/enterprise.js b/src/api/enterprise.js
index 8912de0..513dacb 100644
--- a/src/api/enterprise.js
+++ b/src/api/enterprise.js
@@ -1,49 +1,47 @@
 import request from '@/utils/request'
-const enterprisecategory = '/enterprise/enterpriseCategory'
-const enterprise = '/enterprise/enterprise'
-const enterpriseScore= '/enterprise/enterpriseScore' 
-const enterpriseAdditional='enterprise/enterpriseAdditional'
+const enterprise = '/enterprise'
 export function enterpriseCategoryQueryAll(id) {
-    return request({
-      url: `/gateway${enterprisecategory}/enterpriseCategoryQueryAll`,
-      method: 'post',
-      data: {
-        param: {
-          enterpriseId: id
-        }
+  return request({
+    url: `/gateway${enterprise}/enterpriseCategory/enterpriseCategoryQueryAll`,
+    method: 'post',
+    data: {
+      param: {
+        enterpriseId: id
       }
-    })
-  }
+    }
+  })
+}
 
 export function enterpriseQueryAll(data) {
-    return request({
-      url: `/gateway${enterprise}/enterpriseQueryAll`,
-      method: 'post',
-      data: {
-        param: {
-          pageNum: data.pageNum,
-          pageSize: data.pageSize
-        }
+  return request({
+    url: `/gateway${enterprise}/enterprise/enterpriseQueryAll`,
+    method: 'post',
+    data: {
+      param: {
+        incubatorType: data.incubatorType,
+        pageNum: data.pageNum,
+        pageSize: data.pageSize
       }
-    })
-  }
+    }
+  })
+}
 
 export function enterpriseAdditionalQueryById(id) {
-    return request({
-      url: `/gateway${enterpriseAdditional}/enterpriseAdditionalQueryById`,
-      method: 'post',
-      data: {
-          id: id
-      }
-    })
-  }
+  return request({
+    url: `/gateway${enterprise}/enterpriseAdditional/enterpriseAdditionalQueryById`,
+    method: 'post',
+    data: {
+      id: id
+    }
+  })
+}
 
 export function enterpriseScoreQueryById(id) {
-    return request({
-      url: `/gateway${enterpriseScore}/enterpriseScoreQueryById`,
-      method: 'post',
-      data: {
-          id: id
-      }
-    })
-  }
+  return request({
+    url: `/gateway${enterprise}/enterpriseScore/enterpriseScoreQueryById`,
+    method: 'post',
+    data: {
+      id: id
+    }
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index 0b83713..3a9714a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -107,8 +107,8 @@ export const constantRoutes = [
         meta: { title: '企业信息管理', icon: '' }
       },
       {
-        path: 'Rotation',
-        name: 'Rotation',
+        path: 'demand',
+        name: 'demand',
         component: () => import('@/views/enterprise/demand'),
         meta: { title: '企业需求管理', icon: '' }
       }
diff --git a/src/views/enterprise/demand.vue b/src/views/enterprise/demand.vue
index c3b20b2..76d9f26 100644
--- a/src/views/enterprise/demand.vue
+++ b/src/views/enterprise/demand.vue
@@ -1,61 +1,61 @@
 <template>
   <div class="app-container">
-     <el-table v-loading="listLoading" :data="demandlist" border fit highlight-current-row style="width: 100%;">
-        <el-table-column label="联系电话" prop="contactPhone" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.contactPhone }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="联系人" prop="contacts" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.contacts }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="需求内容" prop="content" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.content}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" prop="createdAt" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.createdAt }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="处理状态" prop="dealStatus" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.dealStatus }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="需求id" prop="id" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.id}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="企业名称" prop="name" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.name }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="类型" prop="type" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.type }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="修改时间" prop="updatedAt" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.updatedAt }}</span>
-          </template>
-        </el-table-column>
-       <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
+    <el-table v-loading="listLoading" :data="demandlist" border fit highlight-current-row style="width: 100%;">
+      <el-table-column label="联系电话" prop="contactPhone" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="edit(row)" >修改处理状态</el-button>
+          <span>{{ row.contactPhone }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="联系人" prop="contacts" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.contacts }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="需求内容" prop="content" align="center">
+        <template slot-scope="{row}">
+          <span>{{ row.content }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="创建时间" prop="createdAt" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.createdAt }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="处理状态" prop="dealStatus" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.dealStatus }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="需求id" prop="id" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.id }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="企业名称" prop="name" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="类型" prop="type" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.type }}</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="修改时间" prop="updatedAt" align="center" width="200">
+        <template slot-scope="{row}">
+          <span>{{ row.updatedAt }}</span>
+        </template>
+      </el-table-column> -->
+      <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
+        <template slot-scope="{row}">
+          <el-button type="primary" size="mini" @click="edit(row)">修改处理状态</el-button>
           <el-button size="mini" type="danger" @click="declare(row)">发榜</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 修改处理状态弹窗 -->
     <el-dialog title="修改处理状态" :visible.sync="dialogFormVisible">
-       <el-form  ref="dataForm"  :model="temp"  label-position="left"  label-width="70px"  style="width: 400px; margin-left:50px;" >
+      <el-form ref="dataForm" :model="temp" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
         <el-form-item label="ID" prop="id" style="width: 180%">
           <el-input v-model="temp.id" />
         </el-form-item>
@@ -71,7 +71,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-       <div slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">
           取消
         </el-button>
@@ -127,7 +127,7 @@ export default {
     },
     async editDeal() {
       const that = this
-      await api.updateDemandStatus(that.temp).then((res) => {    
+      await api.updateDemandStatus(that.temp).then((res) => {
       })
       that.dialogFormVisible = false
       that.getList()
diff --git a/src/views/enterprise/enterprise.vue b/src/views/enterprise/enterprise.vue
index a66151a..f0922ad 100644
--- a/src/views/enterprise/enterprise.vue
+++ b/src/views/enterprise/enterprise.vue
@@ -1,241 +1,251 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-select v-model = "data.type" placeholder="标签" clearable class="filter-item" style="width: 190px;margin-left:10px" value="1">
-        <el-option label="标签二" value="0" />
-        <el-option label="标签二" value="1" />
+      <el-select v-model="data.type" placeholder="孵化器类型" clearable class="filter-item" style="width: 190px;margin-left:10px" value="1">
+        <el-option label="虚拟孵化器" value="0" />
+        <el-option label="实体孵化器" value="1" />
       </el-select>
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="search()">
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="search">
         搜索
       </el-button>
       <!-- 企业列表 -->
       <el-table v-loading="listLoading" :data="enterpriselist" border fit highlight-current-row style="width: 100%;">
-        <el-table-column label="ID" prop="name" align="center" width="500">
+        <el-table-column label="ID" prop="ID" align="center">
           <template slot-scope="{row}">
             <span>{{ row.id }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="名字" prop="name" align="center" width="500">
+        <el-table-column label="企业名称" prop="name" align="center">
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="类型" prop="name" align="center" width="500">
-          <template slot-scope="{row}">
-            <span>{{ row.incubator}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
-        <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="scoreDetail(row.id)" >企业测评详情</el-button>
-          <el-button size="mini" type="danger" @click="enterpriseDetail(row.id)">企业详细信息</el-button>
-          <el-button size="mini" type="danger" @click="enterpriseCategoryQueryAll(row.id)">企业标签</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 企业标签弹框 -->
-    <el-dialog title="企业标签弹框" :visible.sync="dialogFormVisible3">
-      <el-table v-loading="categoryList" :data="detaillist" border fit highlight-current-row style="width: 100%;">
-        <el-table-column>
-           <template slot-scope="{row}">
-            <span>{{row.category}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column>
-           <template slot-scope="{row}">
-            <span>{{row.createdAt}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column>
-           <template slot-scope="{row}">
-            <span>{{row.id}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column>
-           <template slot-scope="{row}">
-            <span>{{row.name}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-    <!-- 企业详细信息弹框 -->
-    <el-dialog title="企业详细信息展示" :visible.sync="dialogFormVisible">
-      <el-table v-loading="listLoading" :data="detaillist" border fit highlight-current-row style="width: 100%;">
-        <el-table-column label="企业是否被列入经营异常名录和严重违法失信企业名单 " prop="dishonestEnterprise" align="center" width="200">
+
+        <el-table-column label="孵化器类型" prop="incubator" align="center">
           <template slot-scope="{row}">
-            <span v-if="row.dishonestEnterprise === 1">有</span>
-            <span v-if="row.dishonestEnterprise === 0">无</span>
+            <span>{{ row.incubator }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="产品和服务是否属于国家规定的禁止、限制和淘汰类" prop="forbidProduct" align="center" width="200">
+
+        <el-table-column label="联系人" prop="contacts" align="center">
           <template slot-scope="{row}">
-            <span v-if="row.forbidProduct === 1">是</span>
-            <span v-if="row.forbidProduct === 0">否</span>
+            <span>{{ row.contacts }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="今年销售收入总额，单位：万" prop="grossSalesOne" align="center" width="200">
+
+        <el-table-column label="联系电话" prop="contactPhone" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.grossSalesOne }}</span>
+            <span>{{ row.contactPhone }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="前年销售收入总额，单位：万" prop="grossSalesThree" align="center" width="200">
+
+        <el-table-column label="税务号" prop="theTaxNo" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.grossSalesThree }}</span>
+            <span>{{ row.theTaxNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="去年销售收入总额，单位：万" prop="grossSalesTwo" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.grossSalesTwo }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="是否拥有有效期内高新技术企业资格证书" prop="highNewTechnologyEnterprise" align="center" width="200">
-          <template slot-scope="{row}">
-            <span v-if="row.highNewTechnologyEnterprise === 1">是</span>
-            <span v-if="row.highNewTechnologyEnterprise === 0">否</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="高新技术产品（服务）费用，单位：万" prop="highNewTechnologyFee" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.highNewTechnologyFee }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="企业详细信息id" prop="id" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.id }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="前一年及当年内有无发生重大安全、重大质量事故和严重环境违法、科研严重失信行为" prop="illegalAct" align="center" width="200">
-          <template slot-scope="{row}">
-            <span v-if="row.illegalAct === 1">是</span>
-            <span v-if="row.illegalAct === 0">否</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="Ⅰ类知识产权数" prop="intellectualPropertyRightI" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.illegalAct }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="Ⅱ类知识产权" prop="intellectualPropertyRightII" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.intellectualPropertyRightII }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="对企业主要产品（服务）发挥核心支持作用的技术" prop="mainProductTechnology" align="center" width="200">
+
+        <!-- <el-table-column label="注册地" prop="theTaxNo" align="center">
           <template slot-scope="{row}">
-            <span v-if="row.mainProductTechnology === 0">其他</span>
-            <span v-if="row.mainProductTechnology === 1">电子信息技术</span>
-            <span v-if="row.mainProductTechnology === 2">生物与医药技术</span>
-            <span v-if="row.mainProductTechnology === 3">航空航天技术</span>
-            <span v-if="row.mainProductTechnology === 4">新材料技术</span>
-            <span v-if="row.mainProductTechnology === 5">高新技术服务技术</span>
-            <span v-if="row.mainProductTechnology === 6">新能源及节能技术</span>
-            <span v-if="row.mainProductTechnology === 7">资源与环境技术</span>
-            <span v-if="row.mainProductTechnology === 8">高新技术改造传统产业</span>
+            <span>{{ row.cities[0] }}-{{ row.cities[1] }}-{{ row.cities[2] }}-{{ row.registrationPlace }}</span>
           </template>
-        </el-table-column>        
-        <el-table-column label="企业名称" prop="name" align="center" width="200">
+        </el-table-column> -->
+
+        <el-table-column label="联系人" prop="name" align="center">
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
           </template>
-        </el-table-column>        
-        <el-table-column label="企业是否拥有经认定的省部级以上研发机构" prop="organization" align="center" width="200">
-          <template slot-scope="{row}">
-            <span v-if="row.organization === 0">否</span>
-            <span v-if="row.organization === 1">是</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="rdexpensesOne" prop="rdexpensesOne" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.rdexpensesOne }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="rdexpensesThree" prop="rdexpensesThree" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.rdexpensesThree }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="rdexpensesTwo" prop="rdexpensesTwo" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.rdexpensesTwo }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="企业近五年内是否主导制定过国际标准、国家标准或行业标准" prop="standard" align="center" width="200">
-          <template slot-scope="{row}">
-            <span v-if="row.standard === 1">是</span>
-            <span v-if="row.standard === 0">否</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="科技人员总数" prop="technicians" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.technicians }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="企业近五年内是否获得过国家级科技奖励，并在获奖单位中排在前三名" prop="technologyAwards" align="center" width="200">
-          <template slot-scope="{row}">
-            <span v-if="row.technologyAwards === 1">是</span>
-            <span v-if="row.technologyAwards === 0">否</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="资产总额，单位：万" prop="totalAssets" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.totalAssets }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="今年成本费用支出总额，单位：万" prop="totalCostExpensesOne" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.totalCostExpensesOne }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="前年成本费用支出总额，单位：万" prop="totalCostExpensesThree" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.totalCostExpensesThree }}</span>
-          </template>
-        </el-table-column>        
-        <el-table-column label="去年成本费用支出总额，单位：万" prop="grossSalesThree" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.illegalAct }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="职工总数" prop="workforce" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.workforce }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-    <!-- 测评详细信息弹框 -->
-    <el-dialog title="测评详细信息" :visible.sync="dialogFormVisible1">
-      <el-table v-loading="listLoading" :data="enterpriseScore" border fit highlight-current-row style="width: 100%;">
-        <el-table-column label="ID" prop="id" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.id }}</span>
-          </template>
         </el-table-column>
-        <el-table-column label="原因" prop="reason" align="center" width="200">
-          <template slot-scope="{row}">
-            <span>{{ row.reason }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="测评结果" prop="result" align="center" width="200">
-          <template slot-scope="{row}">
-            <!-- <span>{{ row.result }}</span> -->
-            <span v-if="row.result === 1">通过</span>
-            <span v-if="row.result === 0">未通过</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="测评类型" prop="type" align="center" width="200">
+
+        <el-table-column label="类型" prop="incubator" align="center">
           <template slot-scope="{row}">
-            <span>{{ row.type }}</span>
+            <span>{{ row.incubator }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" prop="createdAt" align="center" width="200">
+
+        <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
           <template slot-scope="{row}">
-            <span>{{ row.type }}</span>
+            <el-button type="primary" size="mini" @click="scoreDetail(row.id)">企业测评详情</el-button>
+            <el-button size="mini" type="primary" @click="enterpriseDetail(row.id)">企业详细信息</el-button>
+            <el-button size="mini" type="primary" @click="enterpriseCategoryQueryAll(row.id)">企业标签</el-button>
           </template>
         </el-table-column>
       </el-table>
-    </el-dialog>
-    <pagination v-show="total>0" :total="total" :page.sync="data.pageNum" :limit.sync="data.pageSize" @pagination="getList" />
+      <!-- 企业标签弹框 -->
+      <el-dialog title="企业标签" :visible.sync="dialogFormVisible3">
+        <el-table v-loading="listLoading" :data="categoryList" border fit highlight-current-row>
+          <!-- <el-table-column label="标签ID" prop="ID" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.id }}</span>
+            </template>
+          </el-table-column> -->
+
+          <!-- <el-table-column label="企业名称" prop="name" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.name }}</span>
+            </template>
+          </el-table-column> -->
+
+          <!-- <el-table-column label="创建时间" prop="createdAt" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.createdAt }}</span>
+            </template>
+          </el-table-column> -->
+
+          <el-table-column label="企业类型标签" prop="category" align="center">
+            <template slot-scope="{row}">
+              <span>{{ row.category }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="dialogFormVisible3=false">
+            确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <!-- 企业详细信息弹框 -->
+      <el-dialog title="企业详细信息展示" :visible.sync="dialogFormVisible">
+        <el-form ref="dataForm" :model="detaillist" label-position="left" label-width="70px" style="width: auto; margin-left:50px; height:550px; overflow-y:auto; overflow-x:hidden">
+
+          <el-form-item label="企业ID" prop="id" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.id }}</span>
+          </el-form-item>
+
+          <el-form-item label="企业名称" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.name }}</span>
+          </el-form-item>
+
+          <el-form-item label="企业是否被列入经营异常名录和严重违法失信企业名单" style="width: 180%;margin-top:-20px" prop="id" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.dishonestEnterprise }}</span>
+          </el-form-item>
+
+          <el-form-item label="产品和服务是否属于国家规定的禁止、限制和淘汰类" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.forbidProduct }}</span>
+          </el-form-item>
+
+          <el-form-item label="今年销售收入总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.grossSalesOne }}</span>
+          </el-form-item>
+
+          <el-form-item label="前年销售收入总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.grossSalesThree }}</span>
+          </el-form-item>
+
+          <el-form-item label="去年销售收入总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.grossSalesTwo }}</span>
+          </el-form-item>
+
+          <el-form-item label="是否拥有有效期内高新技术企业资格证书" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.highNewTechnologyEnterprise }}</span>
+          </el-form-item>
+
+          <el-form-item label="高新技术产品（服务）费用，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.highNewTechnologyFee }}</span>
+          </el-form-item>
+
+          <el-form-item label="前一年及当年内有无发生重大安全、重大质量事故和严重环境违法、科研严重失信行为" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.illegalAct }}</span>
+          </el-form-item>
+
+          <el-form-item label="Ⅰ类知识产权数" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.intellectualPropertyRightI }}</span>
+          </el-form-item>
+
+          <el-form-item label="Ⅱ类知识产权" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.intellectualPropertyRightII }}</span>
+          </el-form-item>
+
+          <el-form-item label="对企业主要产品（服务）发挥核心支持作用的技术" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.mainProductTechnology }}</span>
+          </el-form-item>
+
+          <el-form-item label="企业是否拥有经认定的省部级以上研发机构" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.organization }}</span>
+          </el-form-item>
+
+          <el-form-item label="今年研发费用总额" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.rdexpensesOne }}</span>
+          </el-form-item>
+          <el-form-item label="前年研发费用总额" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.rdexpensesThree }}</span>
+          </el-form-item>
+          <el-form-item label="去年研发费用总额" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.rdexpensesTwo }}</span>
+          </el-form-item>
+
+          <el-form-item label="企业近五年内是否主导制定过国际标准、国家标准或行业标准" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.standard }}</span>
+          </el-form-item>
+
+          <el-form-item label="科技人员总数" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.technicians }}</span>
+          </el-form-item>
+
+          <el-form-item label="企业近五年内是否获得过国家级科技奖励，并在获奖单位中排在前三名" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.technologyAwards }}</span>
+          </el-form-item>
+
+          <el-form-item label="资产总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.totalAssets }}</span>
+          </el-form-item>
+
+          <el-form-item label="今年成本费用支出总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.totalCostExpensesOne }}</span>
+          </el-form-item>
+
+          <el-form-item label="前年成本费用支出总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.totalCostExpensesThree }}</span>
+          </el-form-item>
+
+          <el-form-item label="去年成本费用支出总额，单位：万" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.totalCostExpensesTwo }}</span>
+          </el-form-item>
+
+          <el-form-item label="职工总数" prop="id" style="width: 180%;margin-top:-20px" label-width="auto">
+            <br><span style="margin-left:100px;">{{ detaillist.workforce }}</span>
+          </el-form-item>
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="dialogFormVisible=false">
+            确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <!-- 测评详细信息弹框 -->
+      <el-dialog title="测评详细信息" :visible.sync="dialogFormVisible1">
+        <el-form ref="dataForm" :model="enterpriseScore" label-position="left" label-width="70px" style="width: 400px; margin-left:50px;">
+
+          <el-form-item label="企业ID" prop="id" style="width: 180%">
+            <span style="margin-left:200px;">{{ enterpriseScore.id }}</span>
+          </el-form-item>
+
+          <el-form-item label="测评时间" prop="createdAt" style="width: 180%">
+            <span style="margin-left:200px;">{{ enterpriseScore.createdAt }}</span>
+          </el-form-item>
+
+          <el-form-item label="测评结果" prop="result" style="width: 180%">
+            <span v-if="enterpriseScore.result === 1" style="margin-left:200px;">通过</span>
+            <span v-if="enterpriseScore.result === 0" style="margin-left:200px;">未通过</span>
+          </el-form-item>
+
+          <el-form-item label="理由" prop="reason" style="width: 180%">
+            <span style="margin-left:200px;">{{ enterpriseScore.reason }}</span>
+          </el-form-item>
+
+          <el-form-item label="测评类型" prop="type" style="width: 180%">
+            <span v-if="enterpriseScore.type === 0" style="margin-left:200px;">科小</span>
+            <span v-if="enterpriseScore.type === 1" style="margin-left:200px;">高企</span>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="dialogFormVisible1=false">
+            确定
+          </el-button>
+        </div>
+      </el-dialog>
+      <pagination v-show="total>0" :total="total" :page.sync="data.pageNum" :limit.sync="data.pageSize" @pagination="getList" />
     </div>
   </div>
 </template>
@@ -249,14 +259,41 @@ export default {
   data() {
     return {
       enterpriselist: [],
-      detaillist: [],
-      enterpriseScore: [],
+      detaillist: {
+        dishonestEnterprise: '',
+        forbidProduct: '',
+        grossSalesOne: '',
+        grossSalesThree: '',
+        grossSalesTwo: '',
+        highNewTechnologyEnterprise: '',
+        highNewTechnologyFee: '',
+        id: '',
+        illegalAct: '',
+        intellectualPropertyRightI: '',
+        intellectualPropertyRightII: '',
+        mainProductTechnology: '',
+        name: '',
+        organization: '',
+        rdexpensesOne: '',
+        rdexpensesThree: '',
+        rdexpensesTwo: '',
+        standard: '',
+        technicians: '',
+        technologyAwards: '',
+        totalAssets: '',
+        totalCostExpensesOne: '',
+        totalCostExpensesThree: '',
+        totalCostExpensesTwo: '',
+        workforce: ''
+      },
+      enterpriseScore: {},
       categoryList: [],
       dialogFormVisible: false,
       dialogFormVisible1: false,
       dialogFormVisible3: false,
       data: {
         type: '',
+        incubatorType: '',
         pageNum: 1,
         pageSize: 20
       },
@@ -280,50 +317,58 @@ export default {
       that.listLoading = true
       await api.enterpriseQueryAll(that.data).then((res) => {
         that.enterpriselist = res.list
-        console.log(res)
-        console.log(this.enterpriselist)
         that.total = res.total - 0
         setTimeout(() => {
           that.listLoading = false
         }, 1000)
       })
     },
-
+    search() {
+      const that = this
+      if (that.data.type === '') {
+        that.data.incubatorType = ''
+      } else {
+        if (that.data.type - 0 === 0 || that.data.type - 0 === 1) {
+          that.data.incubatorType = that.data.type - 0
+        } else {
+          that.data.incubatorType = ''
+        }
+      }
+      this.getList()
+    },
     async enterpriseDetail(id) {
       const that = this
+      for (const key in that.detaillist) {
+        that.detaillist[key] = ''
+      }
       that.listLoading = true
       await api.enterpriseAdditionalQueryById(id).then((res) => {
-          console.log(res)
-          that.$set(that.detaillist, 0,res)
-          setTimeout(() => {
+        if (res) {
+          that.detaillist = res
+        }
+        setTimeout(() => {
           that.listLoading = false
         }, 1000)
+        that.dialogFormVisible = true
       })
-      that.dialogFormVisible = true
     },
 
     async enterpriseCategoryQueryAll(id) {
       const that = this
-      console.log(id)
-
-      await api.enterpriseCategoryQueryAll(id).then((res) =>  {
-        that.categoryList=res.list
-        console.log(res)
-        console.log(that.categoryList)
-         setTimeout(() => {
-          that.listLoading = true
-        }, 1000)
+      that.listLoading = true
+
+      await api.enterpriseCategoryQueryAll(id).then((res) => {
+        that.categoryList = res.list
+        that.dialogFormVisible3 = true
+        that.listLoading = false
       })
-      that.dialogFormVisible3=false
     },
-    
     async scoreDetail(id) {
       const that = this
       that.listLoading = true
       await api.enterpriseScoreQueryById(id).then((res) => {
-          that.$set(that.enterpriseScore, 0,res)
-          console.log(this.enterpriseScore)
-          setTimeout(() => {
+        that.enterpriseScore = res
+        setTimeout(() => {
           that.listLoading = false
         }, 1000)
       })
diff --git a/vue.config.js b/vue.config.js
index 863b75d..2d83c3a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -50,7 +50,7 @@ module.exports = {
     resolve: {
       alias: {
         '@': resolve('src'),
-        'api': resolve('src/api'),
+        'api': resolve('src/api')
       }
     }
   },