Skip to content

E
enterprise-platform
Commit aff16c35 authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加首页统计报表

parent 2167cf59
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 55 deletions
enterprise-manager-ui/admin/src/views/company/drawershow.vue
View file @ aff16c35
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
:direction="direction" :direction="direction"
:destroy-on-close="true" :destroy-on-close="true"
size="80%"> size="80%">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-row> <el-row>
<Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/> <Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/>
<Field label="公司编码" prop="companyCode" v-model="form.companyCode" placeholder="请输入公司编码"/> <Field label="公司编码" prop="companyCode" v-model="form.companyCode" placeholder="请输入公司编码"/>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<Field label="法定代表人" prop="legalRepresentative" v-model="form.legalRepresentative" placeholder="请输入法定代表人"/> <Field label="法定代表人" prop="legalRepresentative" v-model="form.legalRepresentative" placeholder="请输入法定代表人"/>
<Field label="注册资本" prop="registeredCapital" v-model="form.registeredCapital" placeholder="请输入注册资本"/> <Field label="注册资本" prop="registeredCapital" v-model="form.registeredCapital" placeholder="请输入注册资本"/>
<Field label="公司类型" prop="companyType" v-model="form.companyType" placeholder="请输入公司类型"/> <Field label="公司类型" prop="companyType" v-model="form.companyType" placeholder="请输入公司类型"/>
<Field label="经营范围" prop="businessScope" v-model="form.businessScope" placeholder="请输入经营范围"/> <Field :span="24" label="经营范围" prop="businessScope" v-model="form.businessScope" placeholder="请输入经营范围"/>
<!-- <Field :span="24" label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址"> <!-- <Field :span="24" label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址">
<p>当前选中的行政区划编码为： {{regionCodeList}}</p> <p>当前选中的行政区划编码为： {{regionCodeList}}</p>
<el-cascader v-model="regionCodeList" :props="areaprops"></el-cascader> <el-cascader v-model="regionCodeList" :props="areaprops"></el-cascader>
...@@ -26,12 +26,7 @@ ...@@ -26,12 +26,7 @@
</Field> </Field>
<Field label="所在地" prop="location" v-model="form.location" placeholder="请输入所在地"/> <Field label="所在地" prop="location" v-model="form.location" placeholder="请输入所在地"/>
<Field label="联系电话" prop="contactPhone" v-model="form.contactPhone" placeholder="请输入联系电话"/> <Field label="联系电话" prop="contactPhone" v-model="form.contactPhone" placeholder="请输入联系电话"/>
<Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/> <Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/>
<Field label="公司网站" prop="website" v-model="form.website" placeholder="请输入公司网站"/> <Field label="公司网站" prop="website" v-model="form.website" placeholder="请输入公司网站"/>
...@@ -39,20 +34,22 @@ ...@@ -39,20 +34,22 @@
<Field label="社会信用代码" prop="socialCreditCode" v-model="form.socialCreditCode" placeholder="请输入社会信用代码"/> <Field label="社会信用代码" prop="socialCreditCode" v-model="form.socialCreditCode" placeholder="请输入社会信用代码"/>
<Field label="商标信息" prop="trademarkInfo" v-model="form.trademarkInfo" placeholder="请输入商标信息"/> <Field label="商标信息" prop="trademarkInfo" v-model="form.trademarkInfo" placeholder="请输入商标信息"/>
<Field label="网站历史备案信息" prop="websiteRegistrationInfo" v-model="form.websiteRegistrationInfo" placeholder="请输入网站历史备案信息"/> <Field label="网站历史备案信息" prop="websiteRegistrationInfo" v-model="form.websiteRegistrationInfo" placeholder="请输入网站历史备案信息"/>
<Field label="员工总数" prop="totalEmployees" v-model="form.totalEmployees" type="select" :enumData="dict.totalEmployees" placeholder="请选择员工总数"/> <Field label="员工总数" prop="totalEmployees" v-model="form.totalEmployees" placeholder="员工总数"/>
<Field label="软件著作权数量" prop="softNum" v-model="form.softNum" type="select" :enumData="dict.softNum" placeholder="请选择软件著作权数量"/> <Field label="软件著作权数量" prop="softNum" v-model="form.softNum" placeholder="软件著作权数量"/>
<Field label="专利数量" prop="patentNum" v-model="form.patentNum" type="select" :enumData="dict.patentNum" placeholder="请选择专利数量"/> <Field label="专利数量" prop="patentNum" v-model="form.patentNum" placeholder="专利数量"/>
<Field label="历史发展" prop="hisDevelop" v-model="form.hisDevelop" type="textarea" placeholder="请输入历史发展"/> <Field label="历史发展" prop="hisDevelop" v-model="form.hisDevelop" type="textarea" placeholder="请输入历史发展"/>
<Field label="经度" prop="lon" v-model="form.lon" placeholder="请输入经度"/> <Field label="经度" prop="lon" v-model="form.lon" placeholder="请输入经度"/>
<Field label="纬度" prop="lati" v-model="form.lati" placeholder="请输入纬度"/> <Field label="纬度" prop="lati" v-model="form.lati" placeholder="请输入纬度"/>
<Field label="企业logo"><imageUpload v-model="form.logoPath" prePath="/file/preview"/></Field>
<Field label="企业视频"><fileUpload v-model="form.companyVideoPath" :fileType="[ 'mp4', 'avi']" prePath="/file/fileupload"/></Field>
<Field label="企业宣传图片"><fileUpload v-model="form.companyPicPath" :fileType="['png', 'jpg', 'jpeg']" prePath="/file/preview"/></Field>
<Field label="公司介绍" prop="companyIntroduction" v-model="form.companyIntroduction" type="textarea" placeholder="请输入公司介绍"/> <Field label="公司介绍" prop="companyIntroduction" v-model="form.companyIntroduction" type="textarea" placeholder="请输入公司介绍"/>
<Field label="公司文化" prop="companyCulture" v-model="form.companyCulture" type="textarea" placeholder="请输入公司文化"/> <Field label="公司文化" prop="companyCulture" v-model="form.companyCulture" type="textarea" placeholder="请输入公司文化"/>
<Field label="排序" prop="sort" v-model="form.sort" placeholder="请输入排序"/> <Field label="排序" prop="sort" v-model="form.sort" type="num" placeholder="请输入排序"/>
<Field label="成立日期" prop="establishDate" v-model="form.establishDate" type="date" /> <Field label="成立日期" prop="establishDate" v-model="form.establishDate" type="date" />
<Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/>
<Field :span="24" label="企业logo"><imageUpload v-model="form.logoPath" prePath="/file/preview"/></Field>
<Field :span="24" label="企业视频"><fileUpload v-model="form.companyVideoPath" :fileType="[ 'mp4', 'avi']" prePath="/file/fileupload"/></Field>
<Field :span="24" label="企业宣传图片"><fileUpload v-model="form.companyPicPath" :fileType="['png', 'jpg', 'jpeg']" prePath="/file/preview"/></Field>
<Field :span="24" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
</el-row> </el-row>
<el-divider content-position="center">公司标注信息</el-divider> <el-divider content-position="center">公司标注信息</el-divider>
...@@ -69,46 +66,32 @@ ...@@ -69,46 +66,32 @@
<el-table :data="companyLabelsList" :row-class-name="rowCompanyLabelsIndex" @selection-change="handleCompanyLabelsSelectionChange" ref="companyLabels"> <el-table :data="companyLabelsList" :row-class-name="rowCompanyLabelsIndex" @selection-change="handleCompanyLabelsSelectionChange" ref="companyLabels">
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" width="50"/> <el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="标签Id" prop="labelId"> <el-table-column label="标签名称" prop="labelName">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.labelId" placeholder="请输入标签Id" /> <el-input v-model="scope.row.labelName" placeholder="请选择标签名称" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="公司名称" prop="labelName">
<el-table-column label="标签名称" prop="labelId">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.labelName" placeholder="请输入公司名称" /> <Field label="请选择标签名称" prop="labelId" v-model="scope.row.labelId" type="select" :enumData="dict.labels" placeholder="请选择"/>
<!-- <el-input v-model="scope.row.labelName" placeholder="请选择标签名称" />-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="公司名称" prop="companyName">
<!-- <el-table-column label="公司名称" prop="companyName">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.companyName" placeholder="请输入公司名称" /> <el-input v-model="scope.row.companyName" placeholder="请输入公司名称" />
</template> </template>
</el-table-column> </el-table-column>-->
<el-table-column label="备注" prop="remark"> <el-table-column label="备注" prop="remark">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入备注" /> <el-input v-model="scope.row.remark" placeholder="请输入备注" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建用户" prop="createUserId">
<template slot-scope="scope">
<el-input v-model="scope.row.createUserId" placeholder="请输入创建用户" />
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createTime">
<template slot-scope="scope">
<el-input v-model="scope.row.createTime" placeholder="请输入创建时间" />
</template>
</el-table-column>
<el-table-column label="更新用户" prop="updateUserId">
<template slot-scope="scope">
<el-input v-model="scope.row.updateUserId" placeholder="请输入更新用户" />
</template>
</el-table-column>
<el-table-column label="更新时间" prop="updateTime">
<template slot-scope="scope">
<el-input v-model="scope.row.updateTime" placeholder="请输入更新时间" />
</template>
</el-table-column>
</el-table> </el-table>
<form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn /> <form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
......
enterprise-manager-ui/admin/src/views/labels/drawershow.vue
View file @ aff16c35
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
:visible.sync="open" :visible.sync="open"
:direction="direction" :direction="direction"
:destroy-on-close="true" :destroy-on-close="true"
size="50%"> size="70%">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="标签名称" prop="labelName" v-model="form.labelName" placeholder="请输入标签名称"/> <Field :span="20" label="标签名称" prop="labelName" v-model="form.labelName" placeholder="请输入标签名称"/>
<Field label="标签描述" prop="labelDesc" v-model="form.labelDesc" placeholder="请输入标签描述"/> <Field :span="20" label="标签描述" prop="labelDesc" v-model="form.labelDesc" placeholder="请输入标签描述"/>
<Field label="标签图标"><imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/></Field> <Field :span="20" label="标签图标"><imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/></Field>
<Field label="排序" prop="sort" v-model="form.sort" placeholder="请输入排序"/> <Field :span="20" label="排序" prop="sort" type="num" v-model="form.sort" placeholder="请输入排序"/>
<Field label="备注" prop="remark" v-model="form.remark" placeholder="请输入备注"/> <Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
</el-row> </el-row>
......
enterprise-manager-ui/admin/src/views/labels/list.vue
View file @ aff16c35
...@@ -48,9 +48,21 @@ ...@@ -48,9 +48,21 @@
{label: "标签描述", prop: "labelDesc"}, {label: "标签描述", prop: "labelDesc"},
{label: "标签图标", prop: "labelLogoPath"},
{label: "创建用户", prop: "createUserId", formatter: this.formatter}, {label: "标签图标", prop: "labelLogoPath",formatter: (row) => {
return row.labelLogoPath != "" ? (
<el-image
style="width: 70px; height: 70px"
src={row.labelLogoPath}
preview-src-list={[row.labelLogoPath]}
></el-image>
) : (
"--"
);
},},
{label: "创建时间", prop: "createTime", formatter: this.formatterDate},
{ {
label: "操作", label: "操作",
width: 240, width: 240,
......
enterprise-manager/src/main/java/com/mortals/xhx/module/base/web/BaseAreaController.java
View file @ aff16c35
...@@ -43,5 +43,4 @@ public class BaseAreaController extends BaseCRUDJsonBodyMappingController<BaseAr ...@@ -43,5 +43,4 @@ public class BaseAreaController extends BaseCRUDJsonBodyMappingController<BaseAr
} }
} }
\ No newline at end of file
enterprise-manager/src/main/java/com/mortals/xhx/module/company/web/CompanyController.java
View file @ aff16c35
...@@ -7,6 +7,10 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; ...@@ -7,6 +7,10 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.company.model.vo.HomeStatInfo; import com.mortals.xhx.module.company.model.vo.HomeStatInfo;
import com.mortals.xhx.module.company.service.CompanyLabelsService;
import com.mortals.xhx.module.labels.model.LabelsQuery;
import com.mortals.xhx.module.labels.service.LabelsService;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.converter.json.JsonbHttpMessageConverter; import org.springframework.http.converter.json.JsonbHttpMessageConverter;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -50,6 +54,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company ...@@ -50,6 +54,9 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private LabelsService labelsService;
public CompanyController() { public CompanyController() {
super.setModuleDesc("公司"); super.setModuleDesc("公司");
} }
...@@ -59,6 +66,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company ...@@ -59,6 +66,10 @@ public class CompanyController extends BaseCRUDJsonBodyMappingController<Company
this.addDict(model, "totalEmployees", paramService.getParamBySecondOrganize("Company", "totalEmployees")); this.addDict(model, "totalEmployees", paramService.getParamBySecondOrganize("Company", "totalEmployees"));
this.addDict(model, "softNum", paramService.getParamBySecondOrganize("Company", "softNum")); this.addDict(model, "softNum", paramService.getParamBySecondOrganize("Company", "softNum"));
this.addDict(model, "patentNum", paramService.getParamBySecondOrganize("Company", "patentNum")); this.addDict(model, "patentNum", paramService.getParamBySecondOrganize("Company", "patentNum"));
this.addDict(model, "labels", labelsService.find(new LabelsQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getLabelName(),(o,n)->n)));
super.init(model, context); super.init(model, context);
} }
......
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