信息统计end

src/assets/js/httpApi.js

@@ -1241,9 +1241,9 @@ var reqApis = function(){
 				name: '信息统计',
 				Dict: {
 					baseInfo: {
-						"companyName": {name:"企业名称", must:true, 'width': '300px',},
+						"companyName": {name:"企业名称", must:true, 'width': '300px', fixed: true,},
 						
-						"incubatorName": {name:"所属孵化器", must:true,  key:'name', 'width': '180px',},
+						"incubatorName": {name:"所属孵化器", must:true,  key:'name', 'width': '180px',  fixed: true,},
 						"entryDate": {name:"入驻时间", 'width': '180px', },
 						"companyType": {name:"企业类型", 'type':'select', key:'name','width': '180px', },
 						"incubationStatus": {name:"企业孵化状态", 'type':'select', key:'name','width': '180px', },
@@ -1258,15 +1258,15 @@ var reqApis = function(){
 
 						"softwareCopyrightNumber": {name:"软件著作权数（件)", must:true, key:'name', 'width': '180px',},
 						"companyLevelName": {name:"企业级别", must:true,  key:'name', 'width': '180px',},
-						// "totalEmployees": {name:"今年从业人数（人）", must:true, key:'name', 'width': '180px',},
-						// "phdEmployees": {name:"博士人数（人）", must:true, key:'name', 'width': '180px',},
-						// "overseasEmployees": {name:"留学人数（人）", must:true, key:'name', 'width': '180px',},
-						// "revenueLastYear": {name:"上年营业收入（万元）", must:true, key:'name', 'width': '180px',},
-						// "netProfit": {name:"净利润（万元）", must:true, key:'name', 'width': '180px',},
-						// "taxesPaid": {name:"上缴税费（万元）", must:true, key:'name', 'width': '180px',},
-						// "investmentProportion": {name:"研发投入占比", must:true, key:'name', 'width': '180px',},
-						// "grossIncome": {name:"总收入（万元）", must:true, key:'name', 'width': '180px',},
-						// "researchInput": {name:"研发投入（万元）", must:true, key:'name', 'width': '180px',},
+						"totalEmployees": {name:"今年从业人数（人）", must:true, key:'name', 'width': '180px',},
+						"phdEmployees": {name:"博士人数（人）", must:true, key:'name', 'width': '180px',},
+						"overseasEmployees": {name:"留学人数（人）", must:true, key:'name', 'width': '180px',},
+						"revenueLastYear": {name:"上年营业收入（万元）", must:true, key:'name', 'width': '180px',},
+						"netProfit": {name:"净利润（万元）", must:true, key:'name', 'width': '180px',},
+						"taxesPaid": {name:"上缴税费（万元）", must:true, key:'name', 'width': '180px',},
+						"investmentProportion": {name:"研发投入占比", must:true, key:'name', 'width': '180px',},
+						"grossIncome": {name:"总收入（万元）", must:true, key:'name', 'width': '180px',},
+						"researchInput": {name:"研发投入（万元）", must:true, key:'name', 'width': '180px',},
 
 						// "mentorId": {name:"创业导师", 'type':'select', key:'name','width': '180px',},
 
@@ -1281,6 +1281,8 @@ var reqApis = function(){
 								}; return body.incubatorId;
 							});
 						},
+						companyType:[{"name":"服务企业","value":2},{"name":"中介机构","value":1}],
+
 					},
 				},
 				config: {
@@ -1300,14 +1302,22 @@ var reqApis = function(){
 						},
 					],
 					search: [
+						// {
+						// 	'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () {
+						// 		this.loadData()
+						// 	}
+						// },
 						{
-							'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () {
+							'type': 'string', 'name': '企业名称', 'word': 'companyName', 'mode': 0, 'width': '180px', 'clear': function () {
 								this.loadData()
 							}
 						},
 						{ 'type': 'select', 'name': '在孵状态', 'word': 'incubationStatus', 'mode': 1, 'width': '140px' },
 						{ 'type': 'select', 'name': '企业类型', 'word': 'companyType', 'mode': 1, 'width': '140px' },
-					
+						{ 'type': 'select', 'name': '企业级别', 'word': 'companyLevel', 'mode': 1, 'width': '140px' },
+						{ 'type': 'select', 'name': '所属技术领域', 'word': 'technicalField', 'mode': 9, 'width': '140px' },
+						{ 'type': 'select', 'name': '创新创业类型', 'word': 'innovationEntrepreneurship', 'mode': 1, 'width': '140px' },
+						{ 'type': 'daterange', 'defaultTime': ['00:00:00', '23:59:59'], 'name': '日期范围', 'word': 'daterange', 'mode': 0, 'width': '300px', format: 'yyyy-MM-dd' },
 						{
 							'type': 'button', 'label': '查询', 'width': '140px', 'icon': 'el-icon-search', 'click': function (e) {
 								this.table.page = 1;

src/components/TableFilter/index2.vue

@@ -57,7 +57,7 @@
 	<div class="head-container" v-if="form.config.search && form.config.search[0]">
 		<!-- 搜索 -->
 		<template v-for="(item, index) in form.config.search">
-			<!-- <label v-if="item.name" class="el-form-item-label">{{item.name}}</label> -->
+			<label v-if="item.name && item.showLabel" class="el-form-item-label">{{item.name}}</label>
 			<template v-if="item.type==='string'">
 				<el-input v-model="form.query[item.word]" clearable :placeholder="item.name" :style="'width:'+item.width" @clear="item.clear && item.clear.call(_self.$parent)"/>
 			</template>

src/views/business/statistics/index.vue

@@ -24,7 +24,7 @@
 									{{'毕业企业：'+table.body.incubatorGraduateCount || ''}}家    
 									<!-- {{'创业导师数：'+table.body.mentorCount || ''}}&nbsp;&nbsp;&nbsp;&nbsp; -->
 									{{'中介机构：'+table.body.incubatorIntermediaryCount || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
-									{{'今年毕业企业'+table.body.incubatorGraduateCountYear || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
+									{{'今年毕业企业：'+table.body.incubatorGraduateCountYear || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
 
 								</div>
 							</div>
@@ -62,7 +62,7 @@
 import { reqApi, Config } from '@/assets/js/httpApi.js';
 import { Tools } from '@/assets/js/common.js';
 import DateRangePicker from '@/components/DateRangePicker';
-import TableFilter from '@/components/TableFilter';
+import TableFilter from '@/components/TableFilter/index2';
 import cuForm from '@/components/cuForm';
 import cuTable from '@/components/cuTable/index2';