Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	enterprise-manager-ui/admin/src/views/company/drawershow.vue
parents ee80ab23 c8bfc69f
Show whitespace changes
Inline Side-by-side
Showing with 567 additions and 531 deletions
enterprise-manager-ui/admin/README.md 0 → 100644
View file @ 79fec321
# 企业服务平台
## 测试信息
测试环境：http://192.168.0.212:8085
\ No newline at end of file
enterprise-manager-ui/admin/src/components/Confirm.vue
View file @ 79fec321
......@@ -24,9 +24,9 @@ export default {
}
},
methods: {
change() {
change(e) {
this.visible = false;
this.$emit("confirm");
this.$emit("confirm",e);
}
},
data() {
......
enterprise-manager-ui/admin/src/components/tools/FormButtons.vue
View file @ 79fec321
......@@ -3,8 +3,8 @@
<el-form-item>
<slot name="prepend"></slot>
<slot>
<el-button v-if="!noSaveBtn" type="primary" @click='$emit("submit")' size='small' icon='el-icon-circle-check-outline'>保存</el-button>
<el-button v-if="!noCancelBtn" @click="$router.go(-1)" size='small' icon='el-icon-circle-close-outline'>取消</el-button>
<el-button v-if="!noSaveBtn" type="primary" @click='$emit("submit")' icon='el-icon-circle-check-outline'>保存</el-button>
<el-button v-if="!noCancelBtn" @click="$router.go(-1)" icon='el-icon-circle-close-outline'>取消</el-button>
</slot>
<slot name="append"></slot>
</el-form-item>
......
enterprise-manager-ui/admin/src/views/company/drawershow.vue
View file @ 79fec321
......@@ -5,32 +5,36 @@
:visible.sync="open"
:direction="direction"
:destroy-on-close="true"
size="80%">
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
size="80%"
>
<el-form ref="form" :model="form" :rules="rules" label-width="140px" style="padding:0 40px;">
<el-row>
<Field label="公司名称" prop="companyName" v-model="form.companyName" placeholder="请输入公司名称"/>
<Field label="公司编码" prop="companyCode" v-model="form.companyCode" placeholder="请输入公司编码"/>
<Field label="企业名称" prop="companyName" v-model="form.companyName" placeholder="请输入企业名称" />
<Field label="联系电话" prop="contactPhone" v-model="form.contactPhone" placeholder="请输入联系电话" />
<!-- <Field label="公司编码" prop="companyCode" v-model="form.companyCode" placeholder="请输入公司编码"/>
<Field label="注册号" prop="registrationNumber" v-model="form.registrationNumber" placeholder="请输入注册号"/>
<Field label="法定代表人" prop="legalRepresentative" v-model="form.legalRepresentative" placeholder="请输入法定代表人"/>
<Field label="注册资本" prop="registeredCapital" v-model="form.registeredCapital" placeholder="请输入注册资本"/>
<Field label="公司类型" prop="companyType" v-model="form.companyType" 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="businessScope" v-model="form.businessScope" placeholder="请输入经营范围"/>-->
<!-- <Field :span="24" label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址">
<p>当前选中的行政区划编码为： {{regionCodeList}}</p>
<el-cascader v-model="regionCodeList" :props="areaprops"></el-cascader>
</Field>-->
<Field :span="24" label="经营地区" >
<Field
:span="24"
label="经营地址"
prop="businessAdress"
v-model="form.businessAdress"
placeholder="请输入经营地址"
>
<area-select v-model="form.areaCode" @addressSelect="addressSelect"></area-select>
</Field>
<Field label="经营地址" prop="businessAdress" v-model="form.businessAdress" placeholder="请输入经营地址"/>
<Field label="所在地" prop="location" v-model="form.location" placeholder="请输入所在地"/>
<Field label="联系电话" prop="contactPhone" v-model="form.contactPhone" placeholder="请输入联系电话"/>
<Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/>
<!-- <Field label="所在地" prop="location" v-model="form.location" placeholder="请输入所在地"/> -->
<Field prop="location" v-model="form.location" placeholder="请输入详细地址" />
<!-- <Field label="电子邮件地址" prop="email" v-model="form.email" placeholder="请输入电子邮件地址"/>
<Field label="公司网站" prop="website" v-model="form.website" placeholder="请输入公司网站"/>
<Field label="税务登记号" prop="taxRegistrationNumber" v-model="form.taxRegistrationNumber" placeholder="请输入税务登记号"/>
<Field label="社会信用代码" prop="socialCreditCode" v-model="form.socialCreditCode" placeholder="请输入社会信用代码"/>
......@@ -41,43 +45,21 @@
<Field label="专利数量" prop="patentNum" v-model="form.patentNum" placeholder="专利数量"/>
<Field label="历史发展" prop="hisDevelop" v-model="form.hisDevelop" type="textarea" placeholder="请输入历史发展"/>
<Field label="经度" prop="lon" v-model="form.lon" placeholder="请输入经度"/>
<Field label="纬度" prop="lati" v-model="form.lati" 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="lati" v-model="form.lati" placeholder="请输入纬度"/>-->
<!-- <Field label="公司文化" prop="companyCulture" v-model="form.companyCulture" type="textarea" placeholder="请输入公司文化"/>
<Field label="排序" prop="sort" v-model="form.sort" type="num" placeholder="请输入排序"/>
<Field label="成立日期" prop="establishDate" v-model="form.establishDate" type="date" />
<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="请输入备注"/>
<Field label="成立日期" prop="establishDate" v-model="form.establishDate" type="date" />-->
</el-row>
<el-divider content-position="center">公司标签信息</el-divider>
<br/>
<el-row style="margin-left:10px" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddCompanyLabels">添加</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCompanyLabels">删除</el-button>
</el-col>
</el-row>
<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 label="序号" align="center" prop="index" width="50"/>
<!-- <el-table-column label="标签名称" prop="labelName">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.labelName" placeholder="请选择标签名称" />-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="标签名称" prop="labelId">
<template slot-scope="scope">
<el-select v-model="scope.row.labelId" placeholder="请选择标签名称" >
<Field :span="24" label="企业logo">
<imageUpload v-model="form.logoPath" prePath="/file/preview" />
</Field>
<Field :span="24" label="企业标签">
<el-select
v-model="companyLabelsList"
multiple
placeholder="请选择企业标签"
:style="{ width: '590px' }"
>
<el-option
v-for="($label, $value) in dict.labels"
:key="$value"
......@@ -85,84 +67,87 @@
:value="$value"
></el-option>
</el-select>
</Field>
<Field
label="公司介绍"
prop="companyIntroduction"
v-model="form.companyIntroduction"
type="textarea"
placeholder="请输入公司介绍"
/>
<!-- <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>
<!-- <el-input v-model="scope.row.labelName" placeholder="请选择标签名称" />-->
</template>
</el-table-column>
<!-- <el-table-column label="公司名称" prop="companyName">
<template slot-scope="scope">
<el-input v-model="scope.row.companyName" placeholder="请输入公司名称" />
</template>
</el-table-column>-->
<el-table-column label="备注" prop="remark">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入备注" />
</template>
</el-table-column>
</el-table>
<el-divider content-position="center">公司专利信息</el-divider>
<br/>
<el-row style="margin-left:10px" :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddCompanyPatents">添加</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteCompanyPatents">删除</el-button>
</el-col>
<Field :span="24" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>-->
</el-row>
<el-table :data="companyPatentsList" :row-class-name="rowCompanyPatentsIndex" @selection-change="handleCompanyPatentsSelectionChange" ref="companyPatents">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="知识产权类型" prop="intellectPropertyType">
<Field :span="24" label="知识产权">
<el-table
class="zhshchq"
:data="companyPatentsList"
:row-class-name="rowCompanyPatentsIndex"
@selection-change="handleCompanyPatentsSelectionChange"
ref="companyPatents"
>
<!-- <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="intellectPropertyType">
<template slot-scope="scope">
<el-input v-model="scope.row.intellectPropertyType" placeholder="请输入知识产权类型" />
</template>
</el-table-column>
<el-table-column label="知识产权数量" prop="labelId">
<el-table-column label="知识产权数量" prop="labelId" align="center">
<template slot-scope="scope">
<el-input-number v-model="scope.row.intellectPropertyNum" size="small" placeholder='请输入知识产权数量' ></el-input-number>
<el-input-number
v-model="scope.row.intellectPropertyNum"
size="small"
placeholder="请输入知识产权数量"
></el-input-number>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark">
<el-table-column label="操作" width="240">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="请输入备注" />
<Confirm @confirm="handleDeleteCompanyPatents(scope.row)" message="确定要删除该条知识产权吗？">
<div class="del">删除</div>
</Confirm>
</template>
</el-table-column>
</el-table>
<el-row
style="margin:10px 0;display: flex;justify-content: center;"
:gutter="10"
class="mb8"
>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" @click="handleAddCompanyPatents">新增知识产权</el-button>
</el-col>
</el-row>
<form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
<el-form-item v-if="pageInfo.type!='view'" class="formbtns">
<el-button type="primary" @click="submitForm" icon="el-icon-circle-check-outline">保存</el-button>
<el-button @click="open=false" icon="el-icon-circle-close-outline">取消</el-button>
</el-form-item>
</Field>
</el-form>
</el-drawer>
</template>
<script>
import form from "@/assets/mixins/formdialog";
export default {
import form from "@/assets/mixins/formdialog";
import Confirm from "@/components/Confirm.vue";
export default {
name: "CompanyDetail",
mixins: [form],
components: {
Confirm
},
created() {
this.changePath("company")
this.changePath("company");
},
data() {
let that = this
let that = this;
return {
regionCodeList: [],
areaprops: {
// 单选
......@@ -171,23 +156,22 @@
lazy: true,
lazyLoad(node, resolve) {
var param = {
pid:node.level===0?0:node.data.id,
size:-1
pid: node.level === 0 ? 0 : node.data.id,
size: -1
};
that.$post("/base/area/list", param)
.then(res => {
console.log(res)
that.$post("/base/area/list", param).then(res => {
console.log(res);
let nodes = res.data.data.map(item => {
return {
value: item.areaCode,
label: item.name,
id:item.iid,
id: item.iid,
leaf: item.haveSonArea === "False"
}
})
resolve(nodes)
})
};
});
resolve(nodes);
});
}
},
// 子表选中数据
......@@ -204,93 +188,54 @@
title: "公司",
// 是否显示弹出层
open: false,
direction:"rtl",
toString:[
"labelId"
],
toDate:[
"establishDate",
],
direction: "rtl",
toString: ["labelId"],
toDate: ["establishDate"],
// 表单校验
rules: {
companyName: [
{required: true,message: "请输入公司名称", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
{ required: true, message: "请输入公司名称", trigger: "blur" },
{ max: 128, message: "最多只能录入128个字符", trigger: "blur" }
],
areaCode: [
{required: true,message: "请输入所属区域编码", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
{ required: true, message: "请输入所属区域编码", trigger: "blur" },
{ max: 128, message: "最多只能录入128个字符", trigger: "blur" }
],
areaName: [
{required: true,message: "请输入所属区域名称", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
{ required: true, message: "请输入所属区域名称", trigger: "blur" },
{ max: 128, message: "最多只能录入128个字符", trigger: "blur" }
],
contactPhone: [
{required: true,message: "请输入联系电话", trigger: "blur" },
{max: 32,message: "最多只能录入32个字符",trigger: "blur",},
{ required: true, message: "请输入联系电话", trigger: "blur" },
{ max: 32, message: "最多只能录入32个字符", trigger: "blur" }
],
lon: [
{required: true,message: "请输入经度", trigger: "blur" },
{max: 32,message: "最多只能录入32个字符",trigger: "blur",},
{ required: true, message: "请输入经度", trigger: "blur" },
{ max: 32, message: "最多只能录入32个字符", trigger: "blur" }
],
lati: [
{required: true,message: "请输入纬度", trigger: "blur" },
{max: 32,message: "最多只能录入32个字符",trigger: "blur",},
{ required: true, message: "请输入纬度", trigger: "blur" },
{ max: 32, message: "最多只能录入32个字符", trigger: "blur" }
],
logoPath: [
{required: true,message: "请输入企业logo", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
],
establishDate: [
{required: true,message: "请选择成立日期" },
],
createTime: [
{required: true,message: "请选择创建时间" },
{ required: true, message: "请输入企业logo", trigger: "blur" },
{ max: 128, message: "最多只能录入128个字符", trigger: "blur" }
],
establishDate: [{ required: true, message: "请选择成立日期" }],
createTime: [{ required: true, message: "请选择创建时间" }]
}
};
},
methods: {
addressSelect(val){
console.log("addressSelect",val)
addressSelect(val) {
console.log("addressSelect", val);
},
/** 公司标注序号 */
rowCompanyLabelsIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
/** 公司标注添加按钮操作 */
handleAddCompanyLabels() {
let obj = {};
obj.labelId = "";
obj.labelName = "";
obj.companyName = "";
obj.remark = "";
obj.createUserId = "";
obj.createTime = "";
obj.updateUserId = "";
obj.updateTime = "";
this.companyLabelsList.push(obj);
},
/** 公司标注删除按钮操作 */
handleDeleteCompanyLabels() {
if (this.checkedCompanyLabels.length == 0) {
this.$alert("请先选择要删除的公司标注数据", "提示", { confirmButtonText: "确定", });
} else {
this.companyLabelsList.splice(this.checkedCompanyLabels[0].index - 1, 1);
}
},
/** 单选框选中数据 */
handleCompanyLabelsSelectionChange(selection) {
if (selection.length > 1) {
this.$refs.companyLabels.clearSelection();
this.$refs.companyLabels.toggleRowSelection(selection.pop());
} else {
this.checkedCompanyLabels = selection;
}
},
/** 公司专利序号 */
rowCompanyPatentsIndex({ row, rowIndex }) {
......@@ -310,12 +255,13 @@
this.companyPatentsList.push(obj);
},
/** 公司专利删除按钮操作 */
handleDeleteCompanyPatents() {
if (this.checkedCompanyPatentss.length == 0) {
this.$alert("请先选择要删除的公司专利数据", "提示", { confirmButtonText: "确定", });
} else {
this.companyPatentsList.splice(this.checkedCompanyPatents[0].index - 1, 1);
}
handleDeleteCompanyPatents(row) {
// 由于有一些知识产权还没有id，所以这里删除选用的是字段中带的index
this.companyPatentsList = this.companyPatentsList.filter(
item => item.index !== row.index
);
this.form.companyPatentsList = this.companyPatentsList;
},
/** 单选框选中数据 */
handleCompanyPatentsSelectionChange(selection) {
......@@ -329,45 +275,46 @@
// 渲染前置处理
beforeRender(data) {
if(data.entity.companyLabelsList) {
if (data.entity.companyLabelsList) {
let arr = [];
data.entity.companyLabelsList.forEach(item => {
//如果相等做操作
item['labelId'] = item[ 'labelId']+ '';
})
this.companyLabelsList = data.entity.companyLabelsList;
item["labelId"] = item["labelId"] + "";
arr.push(item.labelId);
});
this.companyLabelsList = arr;
}
if(data.entity.companyPatentsList) {
if (data.entity.companyPatentsList) {
this.companyPatentsList = data.entity.companyPatentsList;
}
return data
return data;
},
/** 编辑 */
edit(row) {
this.reset()
this.reset();
this.query = { id: row.id };
this.urls.currUrl ="company/edit";
this.urls.currUrl = "company/edit";
this.getData();
this.pageInfo.type="edit"
this.title = "修改公司";
this.pageInfo.type = "edit";
this.title = "编辑企业信息";
},
/** 新增 */
add(row) {
this.reset()
this.reset();
this.urls.currUrl = "company/add";
this.getData();
this.pageInfo.type="add"
this.title = "新增公司";
this.pageInfo.type = "add";
this.title = "新增企业";
},
/** 查看*/
view(row) {
this.reset()
this.reset();
this.query = { id: row.id };
this.urls.currUrl ="company/view";
this.urls.currUrl = "company/view";
this.getData();
this.pageInfo.type="view"
this.title = "公司详细";
this.pageInfo.type = "view";
this.title = "企业详情";
},
/**取消按钮 */
cancel() {
......@@ -386,40 +333,40 @@
// 表单重置
reset() {
this.form = {
companyName : "",
companyCode : "",
registrationNumber : "",
legalRepresentative : "",
registeredCapital : "",
companyType : "",
businessScope : "",
businessAdress : "",
location : "",
areaCode : "",
areaName : "",
contactPhone : "",
email : "",
website : "",
taxRegistrationNumber : "",
socialCreditCode : "",
trademarkInfo : "",
websiteRegistrationInfo : "",
totalEmployees : null,
softNum : null,
patentNum : null,
hisDevelop : "",
lon : "",
lati : "",
logoPath : "",
companyVideoPath : "",
companyPicPath : "",
companyIntroduction : "",
companyCulture : "",
sort : 0,
establishDate : null,
remark : "",
companyLabelsList:[],
companyPatentsList:[]
companyName: "",
companyCode: "",
registrationNumber: "",
legalRepresentative: "",
registeredCapital: "",
companyType: "",
businessScope: "",
businessAdress: "",
location: "",
areaCode: "",
areaName: "",
contactPhone: "",
email: "",
website: "",
taxRegistrationNumber: "",
socialCreditCode: "",
trademarkInfo: "",
websiteRegistrationInfo: "",
totalEmployees: null,
softNum: null,
patentNum: null,
hisDevelop: "",
lon: "",
lati: "",
logoPath: "",
companyVideoPath: "",
companyPicPath: "",
companyIntroduction: "",
companyCulture: "",
sort: 0,
establishDate: null,
remark: "",
companyLabelsList: [],
companyPatentsList: []
};
this.resetForm("form");
},
......@@ -427,7 +374,34 @@
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
}
},
},
};
watch: {
companyLabelsList(newval) {
let arr = [];
newval.forEach(item => {
arr.push({
labelId: item
});
});
this.form.companyLabelsList = arr;
}
}
};
</script>
<style lang="less" scoped>
.del {
color: red;
}
.formbtns {
display: flex;
justify-content: flex-end;
align-items: center;
height: 60px;
margin-top: 30px;
}
.zhshchq {
margin-top: 20px;
}
</style>
\ No newline at end of file
enterprise-manager-ui/admin/src/views/company/list.vue
View file @ 79fec321
<template>
<div class="page">
<LayoutTable :data="tableData" :config="tableConfig">
<LayoutTable :data="tableData" :config="tableConfig" notDel>
</LayoutTable>
<drawer-show ref="drawerform" @ok="getData" />
......
enterprise-manager-ui/admin/src/views/labels/drawershow.vue
View file @ 79fec321
......@@ -5,33 +5,60 @@
:visible.sync="open"
:direction="direction"
:destroy-on-close="true"
size="70%">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
size="70%"
>
<el-form ref="form" :model="form" :rules="rules" label-width="120px" style="padding:0 40px;">
<el-row>
<Field :span="20" label="标签名称" prop="labelName" v-model="form.labelName" placeholder="请输入标签名称"/>
<Field :span="20" label="标签描述" prop="labelDesc" v-model="form.labelDesc" placeholder="请输入标签描述"/>
<Field :span="20" label="标签图标"><imageUpload v-model="form.labelLogoPath" prePath="/file/preview"/></Field>
<Field :span="20" label="排序" prop="sort" type="num" v-model="form.sort" placeholder="请输入排序"/>
<Field :span="20" label="备注" prop="remark" v-model="form.remark" type="textarea" placeholder="请输入备注"/>
<Field
:span="20"
label="标签名称"
prop="labelName"
v-model="form.labelName"
placeholder="请输入标签名称"
/>
<Field
:span="20"
label="标签描述"
prop="labelDesc"
v-model="form.labelDesc"
placeholder="请输入标签描述"
/>
<Field :span="20" label="标签图标">
<imageUpload v-model="form.labelLogoPath" prePath="/file/preview" />
</Field>
<Field
:span="20"
label="排序"
prop="sort"
type="num"
v-model="form.sort"
placeholder="请输入排序"
/>
<Field
:span="20"
label="备注"
prop="remark"
v-model="form.remark"
type="textarea"
placeholder="请输入备注"
/>
</el-row>
<form-buttons @submit='submitForm' v-if="pageInfo.type!='view'" noCancelBtn />
<el-form-item v-if="pageInfo.type!='view'" class="formbtns">
<el-button type="primary" @click="submitForm" icon="el-icon-circle-check-outline">保存</el-button>
<el-button @click="open=false" icon="el-icon-circle-close-outline">取消</el-button>
</el-form-item>
</el-form>
</el-drawer>
</template>
<script>
import form from "@/assets/mixins/formdialog";
export default {
import form from "@/assets/mixins/formdialog";
export default {
name: "LabelsDetail",
mixins: [form],
components: {
},
components: {},
created() {
this.changePath("labels")
this.changePath("labels");
},
data() {
return {
......@@ -41,20 +68,16 @@
title: "标注",
// 是否显示弹出层
open: false,
direction:"rtl",
toString:[
],
toDate:[
],
direction: "rtl",
toString: [],
toDate: [],
// 表单校验
rules: {
labelName: [
{required: true,message: "请输入标签名称", trigger: "blur" },
{max: 128,message: "最多只能录入128个字符",trigger: "blur",},
],
createTime: [
{required: true,message: "请选择创建时间" },
{ required: true, message: "请输入标签名称", trigger: "blur" },
{ max: 128, message: "最多只能录入128个字符", trigger: "blur" }
],
createTime: [{ required: true, message: "请选择创建时间" }]
}
};
},
......@@ -62,28 +85,28 @@
methods: {
/** 编辑 */
edit(row) {
this.reset()
this.reset();
this.query = { id: row.id };
this.urls.currUrl ="labels/edit";
this.urls.currUrl = "labels/edit";
this.getData();
this.pageInfo.type="edit"
this.pageInfo.type = "edit";
this.title = "修改标注";
},
/** 新增 */
add(row) {
this.reset()
this.reset();
this.urls.currUrl = "labels/add";
this.getData();
this.pageInfo.type="add"
this.pageInfo.type = "add";
this.title = "新增标注";
},
/** 查看*/
view(row) {
this.reset()
this.reset();
this.query = { id: row.id };
this.urls.currUrl ="labels/view";
this.urls.currUrl = "labels/view";
this.getData();
this.pageInfo.type="view"
this.pageInfo.type = "view";
this.title = "标注详细";
},
/**取消按钮 */
......@@ -103,11 +126,11 @@
// 表单重置
reset() {
this.form = {
labelName : "",
labelDesc : "",
labelLogoPath : "",
sort : 0,
remark : "",
labelName: "",
labelDesc: "",
labelLogoPath: "",
sort: 0,
remark: ""
};
this.resetForm("form");
},
......@@ -115,7 +138,16 @@
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
},
},
};
}
}
};
</script>
<style lang="less" scoped>
.formbtns {
display: flex;
justify-content: flex-end;
align-items: center;
height: 60px;
margin-top: 30px;
}
</style>
enterprise-manager/pom.xml
View file @ 79fec321
......@@ -28,6 +28,11 @@
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.rabbitmq.host>192.168.0.251</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>root_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>xhx@2022</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.log.level>info</profiles.log.level>
<profiles.publish.path>/home/publish</profiles.publish.path>
......
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/req/NewsReq.java
View file @ 79fec321
......@@ -18,6 +18,6 @@ public class NewsReq extends BaseReq {
/**
* 分类id
*/
private Long categoryId;
private Long newsCategoryId;
}
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/NewsApiController.java
View file @ 79fec321
......@@ -13,6 +13,8 @@ import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.busiz.applets.req.NewsReq;
import com.mortals.xhx.busiz.applets.rsp.NewsListInfo;
import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.module.category.model.CategoryQuery;
import com.mortals.xhx.module.category.service.CategoryService;
import com.mortals.xhx.module.dept.model.DeptQuery;
import com.mortals.xhx.module.dept.service.DeptService;
import com.mortals.xhx.module.news.model.NewsCategoryQuery;
......@@ -21,6 +23,7 @@ import com.mortals.xhx.module.news.model.NewsQuery;
import com.mortals.xhx.module.news.service.NewsCategoryService;
import com.mortals.xhx.module.news.service.NewsService;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
......@@ -60,6 +63,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
@Autowired
private UserService userService;
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "top", paramService.getParamBySecondOrganize("News", "top"));
this.addDict(model, "viewNums", paramService.getParamBySecondOrganize("News", "viewNums"));
......@@ -69,10 +73,27 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
}
/**
* 新闻频道分类
*/
@PostMapping(value = "categoryList")
public Rest<Object> categoryList(){
String busiDesc = "新闻频道";
Rest<Object> rest = Rest.ok();
try {
rest.setData(newsCategoryService.find(new NewsCategoryQuery()));
}catch (Exception e) {
log.error(busiDesc, e);
rest = Rest.fail(super.convertException(e));
}
return rest;
}
/**
* 新闻列表
*/
@PostMapping(value = "list")
@PostMapping(value = "newsList")
public Rest<Object> newsList(@RequestBody NewsReq newsReq) {
String busiDesc = "新闻列表";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(newsReq));
......@@ -86,8 +107,8 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
PageInfo pageInfo = buildPageInfo(newsReq);
NewsQuery query = new NewsQuery();
if(!ObjectUtils.isEmpty(newsReq.getCategoryId())){
query.setCategoryId(newsReq.getCategoryId());
if(!ObjectUtils.isEmpty(newsReq.getNewsCategoryId())){
query.setCategoryId(newsReq.getNewsCategoryId());
}
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
......@@ -113,7 +134,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
/**
* 新闻详细
*/
@PostMapping(value = "info")
@PostMapping(value = "newsInfo")
public Rest<NewsEntity> appealInfo(@RequestBody NewsReq newsReq) {
String busiDesc = "新闻详细";
log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(newsReq));
......
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