Skip to content

G
GaoQuIncubator
Commit 069e7154 authored by xinzhedeai's avatar xinzhedeai
Browse files
Options

merge fixed

parents fc68f4aa ae6c848e
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 123 deletions
src/api/system/home.js
View file @ 069e7154
......@@ -7,6 +7,13 @@ export function getData(data) {
})
}
export function getData4tech(data) {
return request({
url: 'api/incubator',
method: 'get',
})
}
export function del(ids) {
return request({
url: 'api/users',
......@@ -22,6 +29,13 @@ export function edit(data) {
data
})
}
export function add(data) {
return request({
url: 'api/incubator',
method: 'post',
data
})
}
export function editUser(data) {
return request({
......@@ -32,5 +46,5 @@ export function editUser(data) {
}
export default { getData, edit, del }
export default { getData, getData4tech, add, edit, del }
src/assets/js/httpApi.js
View file @ 069e7154
......@@ -1241,9 +1241,9 @@ var reqApis = function(){
name: '信息统计',
Dict: {
baseInfo: {
"companyName": {name:"企业名称", must:true, fixed:true,'width': '300px',},
"companyName": {name:"企业名称", must:true, 'width': '300px',},
"incubatorName": {name:"所属孵化器", must:true, fixed:true, key:'name', 'width': '180px',},
"incubatorName": {name:"所属孵化器", must:true, key:'name', 'width': '180px',},
"entryDate": {name:"入驻时间", 'width': '180px', },
"companyType": {name:"企业类型", 'type':'select', key:'name','width': '180px', },
"incubationStatus": {name:"企业孵化状态", 'type':'select', key:'name','width': '180px', },
......@@ -1269,7 +1269,18 @@ var reqApis = function(){
"researchInput": {name:"研发投入（万元）", must:true, key:'name', 'width': '180px',},
// "mentorId": {name:"创业导师", 'type':'select', 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',},
// "mentorId": {name:"创业导师", 'type':'select', key:'name','width': '180px',},
},
selectList: {
incubatorId: function(slist) {
......
src/router/routers.js
View file @ 069e7154
......@@ -53,28 +53,19 @@ export const constantRouterMap = [
}
]
},
// {
// path: "/home",
// //component: Layout,
// component: HomeLayout,
// redirect: "noredirect",
// hidden:false,
// children: [
// {
// path: "enterprise",
// component: resolve => require(["@/views/system/home/enterprise"], resolve),
// name: "首页-企业",
// meta: { title: "首页", affix:true , icon: "index"}
// }
// ]
// },
{
path: "/home",
//component: Layout,
component: HomeLayout,
redirect: "noredirect",
hidden:false,
hidden:true,
children: [
{
path: "enterprise",
component: resolve => require(["@/views/system/home/enterprise"], resolve),
name: "首页-企业",
meta: { title: "首页", affix:true , icon: "index"}
},
{
path: "tech",
component: resolve => require(["@/views/system/home/tech"], resolve),
......@@ -83,6 +74,16 @@ export const constantRouterMap = [
}
]
},
// {
// path: "/home",
// //component: Layout,
// component: HomeLayout,
// redirect: "noredirect",
// hidden:true,
// children: [
// ]
// },
{
path: "/edge/Screen",
component: (resolve) => {
......
src/views/Screen/index.vue
View file @ 069e7154
......@@ -10,7 +10,7 @@
<h2>威海高新区科技企业孵化信息平台</h2>
</div>
<div class="go-back">
<a href="/home/enterprise">进入后台</a>
<a @click="goBackendHome">进入后台</a>
</div>
</header>
</div>
......@@ -153,6 +153,17 @@ export default {
});
},
methods: {
goBackendHome(){
if(localStorage.getItem('groupIdByloginType')*1 == 1){ // 孵化器用户
location.href = '/home/enterprise'
return
}
if(localStorage.getItem('groupIdByloginType')*1 == 2){ // 科技据用户
location.href = '/home/tech'
return
}
location.reload()
},
initMap() {
var VUE = this;
VUE.map = new AMap.Map("container", {
......
src/views/business/statistics/index.vue
View file @ 069e7154
......@@ -17,14 +17,15 @@
<div class="toolbar">
<div>
<el-button v-for="(item, key) in form.config.otherBtn" size="mini" :type="item.type" :icon="item.icon" @click="item.callback.call(_self, $event)">{{item.name}}</el-button>
<div class="info" style="font-size:16px;">
{{'孵化器：'+table.body.incubatorAllCount || ''}}&nbsp;&nbsp;&nbsp;&nbsp;
{{'在孵企业：'+table.body.incubatorInCount || ''}}&nbsp;&nbsp;&nbsp;&nbsp;
{{'毕业企业：'+table.body.incubatorGraduateCount || ''}}&nbsp;&nbsp;&nbsp;&nbsp;
{{'企业数：'+table.total || ''}}个&nbsp;&nbsp;&nbsp;&nbsp;
{{'孵化器：'+table.body.incubatorAllCount || ''}}个&nbsp;&nbsp;&nbsp;&nbsp;
{{'在孵企业：'+table.body.incubatorInCount || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
{{'毕业企业：'+table.body.incubatorGraduateCount || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
<!-- {{'创业导师数：'+table.body.mentorCount || ''}}&nbsp;&nbsp;&nbsp;&nbsp; -->
{{'中介机构：'+table.body.incubatorIntermediaryCount || ''}}&nbsp;&nbsp;&nbsp;&nbsp;
{{'今年毕业企业'+table.body.incubatorGraduateCountYear || ''}}&nbsp;&nbsp;&nbsp;&nbsp;
{{'中介机构：'+table.body.incubatorIntermediaryCount || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
{{'今年毕业企业'+table.body.incubatorGraduateCountYear || ''}}家&nbsp;&nbsp;&nbsp;&nbsp;
</div>
</div>
......
src/views/system/home/tech.vue
View file @ 069e7154
......@@ -4,31 +4,31 @@
<ul>
<li>
<div class="title">孵化器</div>
<div class="content">8家</div>
<div class="content">{{data.incubatorAllCount}}家</div>
</li>
<li>
<div class="title">在孵企业</div>
<div class="content">8家</div>
<div class="content">{{data.incubatorCompanyCount}}家</div>
</li>
<li>
<div class="title">毕业企业</div>
<div class="content">8家</div>
<div class="content">{{data.unIncubatorCompanyCount}}家</div>
</li>
<li>
<div class="title">中介机构</div>
<div class="content">8家</div>
<div class="content">{{data.intermediaryAgencyCount}}家</div>
</li>
<li>
<div class="title">创业导师</div>
<div class="content">8家</div>
<div class="content">{{data.mentorAllCount}}家</div>
</li>
<li>
<div class="title">孵化面积</div>
<div class="content">8家</div>
<div class="content">{{data.totalArea}}(㎡)</div>
</li>
<li>
<div class="title">剩余孵化面积</div>
<div class="content">8家</div>
<div class="content">{{data.remainingArea}}(㎡)</div>
</li>
<li>
<div class="title" @click="dialogVisible = true">新增孵化器</div>
......@@ -38,74 +38,14 @@
<div class="body">
<ul class="list">
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
</div>
</li>
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
</div>
</li>
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
</div>
</li>
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
</div>
</li>
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<li v-for="(item) in data.list" :key="item.id" @click="go2overview">
<img :src="`${baseAPI}file/${item.incubatorImage}`"alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
</div>
</li>
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
</div>
</li>
<li>
<img src="https://dummyimage.com/360x442" alt="" />
<div class="introduce">
<h2>威海高新区创业中心</h2>
<p>运营机构:威海高新创业园运营管理有限公司</p>
<p>联系人:联系人姓名</p>
<p>联系电话:0631-1234567</p>
<p>剩余孵化面积:0123m2</p>
<h2>{{ item.incubatorName }}</h2>
<p>运营机构:{{ item.operatingAgency }}</p>
<p>联系人:{{ item.contactPerson }}</p>
<p>联系电话: {{ item.contactPhone }}</p>
<p>剩余孵化面积:{{item.remainingArea}} (m²)</p>
</div>
</li>
</ul>
......@@ -245,6 +185,7 @@ var baseAPI =
? process.env.VUE_APP_LOCAL_API + "/"
: (VUE_APP_API.ServiceURL || process.env.VUE_APP_LOCAL_API) + "/";
import crudHome from "@/api/system/home";
console.log(crudHome);
import IconSelect from "@/components/IconSelect";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
......@@ -297,6 +238,19 @@ export default {
mixins: [presenter(), header(), form(defaultForm), crud()],
data() {
return {
data:{
incubatorAllCount: 6,
incubatorCompanyCount: 10,
intermediaryAgencyCount: 10,
mentorAllCount: 7,
remainingArea: -99750,
total: 6,
totalArea: 382,
unIncubatorCompanyCount: 14,
list: []
},
dialogVisible: false,
baseAPI: baseAPI,
labelPosition: "right",
......@@ -310,7 +264,7 @@ export default {
id: "",
incubationArea: "",
incubatorImage: "",
incubatorLevel: "",
incubatorLevel: 2,
incubatorName: "",
latitude: "",
longitude: "",
......@@ -341,8 +295,12 @@ export default {
console.log(res);
this.companyLevelList = res.body.incubatorLevel || [];
});
this.getData();
},
methods: {
go2overview(){
alert('数据概览页开发ing~')
},
handleSuccess(response, file) {
// 处理上传成功
console.log("Upload success:", response, file);
......@@ -413,8 +371,6 @@ export default {
},
});
}
VUE.getData(function () {});
},
click: function (e, cmap) {
// 经纬度坐标
......@@ -480,30 +436,25 @@ export default {
console.log("submit!");
},
edit() {
crudHome.edit(this.formInline).then((res) => {
if(this.formInline.incubatorName){
}
crudHome.add(this.formInline).then((res) => {
if (res && res.code === 200) {
this.$message.success("保存成功"); // res.msg
this.getData();
this.dialogVisible = false
}
});
},
getData(fn) {
crudHome.getData().then((res) => {
this.formInline = res.body;
this.formInline.incubatorImage = res.body.incubatorImage;
const lat = this.formInline.latitude;
const lng = this.formInline.longitude;
// this.$refs.amap.init(amapOptions());
const center = [lng, lat];
// setTimeout(() => {
// 定位中心地址
this.$refs.amap.setCenter(center);
console.log("map", this.cmap);
// 定位marker设置
this.cmap.marker.setPosition(new AMap.LngLat(lng, lat));
// }, 3000);
console.log();
fn && fn();
crudHome.getData4tech({
page: 0,
size: 999,
}).then((res) => {
console.log(res, "getData4tech");
this.data = res.body
});
},
// 选中图标
......@@ -543,6 +494,9 @@ export default {
justify-content: center;
border-left: 1px solid #d8dce5;
height: 70px;
&:nth-child(1){
border-left: none;
}
&:nth-child(2) {
.title {
background-image: url("~@/assets/images/iconNew/zfqy.png");
......@@ -608,16 +562,18 @@ export default {
display: flex;
flex-wrap: wrap;
padding-top: 18px;
padding-left: 80px;
padding-left: 18px;
// justify-content: center;
li {
width: 360px;
height: 442px;
background: #ffffff;
border-radius: 10px;
margin-left: 23px;
margin-right: 23px;
margin-bottom: 16px;
position: relative;
cursor: pointer;
.introduce {
padding: 20px;
border-radius: 10px;
......@@ -629,7 +585,7 @@ export default {
}
img {
width: 100%;
height: 442px;
// height: 442px;
border-radius: 10px;
}
h2 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment