master #20

Merged
lukeyan merged 3 commits from master into lukeyan 1 year ago

@ -180,15 +180,15 @@
</div>
</el-dialog>
</div>
<monitor :companyID="companyID" ref="child2-1"></monitor>
<kakou :companyID="companyID" ref="child2-2"></kakou>
<yujing :companyID="companyID" ref="child2-3"></yujing>
<qiyeyuangong :companyID="companyID" ref="child3-1"></qiyeyuangong>
<!-- <liudongrenyuan :companyID="companyID" ref="child3-2"></liudongrenyuan>
<fangke :companyID="companyID" ref="child3-3"></fangke> -->
<car :companyID="companyID" ref="child4"></car>
<wupin :companyID="companyID" ref="child5"></wupin>
<anjian :companyID="companyID" ref="child6"></anjian>
<monitor :companyID="companyID" ref="child2-1" v-if="companyID"></monitor>
<kakou :companyID="companyID" ref="child2-2" v-if="companyID"></kakou>
<yujing :companyID="companyID" ref="child2-3" v-if="companyID"></yujing>
<qiyeyuangong :companyID="companyID" ref="child3-1" v-if="companyID"></qiyeyuangong>
<!-- <liudongrenyuan :companyID="companyID" ref="child3-2" v-if="companyID"></liudongrenyuan>
<fangke :companyID="companyID" ref="child3-3" v-if="companyID"></fangke> -->
<car :companyID="companyID" ref="child4" v-if="companyID"></car>
<wupin :companyID="companyID" ref="child5" v-if="companyID"></wupin>
<anjian :companyID="companyID" ref="child6" v-if="companyID"></anjian>
</el-scrollbar>
</div>
</div>

@ -1,22 +1,12 @@
<!-- 新增企业或者查看企业名单 -->
<template>
<el-dialog
class="dialog"
:title="dialogTitle"
:visible.sync="visible"
:close-on-click-modal="false"
width="970px"
>
<el-dialog class="dialog" :title="dialogTitle" :visible.sync="visible" :close-on-click-modal="false" width="970px">
<div class="form_body">
<div class="commerceMessage">
<p>企业工商信息</p>
<!-- 为适应上传图片表单布局把企业工商表单拆分 -->
<div class="commerceMessage_one">
<el-form
ref="commerceMessage_form"
:model="form"
class="commerceMessage_form"
>
<el-form ref="commerceMessage_form" :model="form" class="commerceMessage_form">
<el-form-item label="企业名称">
<el-input v-model="form.companyName"></el-input>
</el-form-item>
@ -45,32 +35,16 @@
<el-input v-model="form.businessStatus"></el-input>
</el-form-item>
</el-form>
<el-upload
ref="upload"
class="avatar-uploader"
accept=".jpg,.jpeg,.png,.gif,.JPG,.JPEG"
:action="upUrl"
:headers="upheaders"
:show-file-list="false"
:on-success="handleAvatarSuccess"
>
<img
v-if="imageUrl"
:src="imageUrl"
class="avatar"
@error="setDefaultImage"
/>
<el-upload ref="upload" class="avatar-uploader" accept=".jpg,.jpeg,.png,.gif,.JPG,.JPEG" :action="upUrl"
:headers="upheaders" :show-file-list="false" :on-success="handleAvatarSuccess">
<img v-if="imageUrl" :src="imageUrl" class="avatar" @error="setDefaultImage" />
<div v-else class="avatar-uploader-icon">
<div>点击上传企业封面图片</div>
</div>
</el-upload>
</div>
<!-- 为适应上传图片表单布局把企业工商表单拆分,剩余部分 -->
<el-form
ref="commerceMessage_form_two"
:model="form"
class="commerceMessage_form_two"
>
<el-form ref="commerceMessage_form_two" :model="form" class="commerceMessage_form_two">
<el-form-item label="企业登记注册地">
<el-input v-model="form.registerAddress"></el-input>
</el-form-item>
@ -95,11 +69,7 @@
<!-- 企业联系人信息表单 -->
<div class="company_person_message">
<p>企业联系人信息</p>
<el-form
ref="company_person_message_form"
:model="form"
class="company_person_message_form"
>
<el-form ref="company_person_message_form" :model="form" class="company_person_message_form">
<el-form-item label="安全责任人">
<el-input v-model="form.emergencyContact"></el-input>
</el-form-item>
@ -111,87 +81,40 @@
<!-- 企业位置信息表单 -->
<div class="company_position">
<p>企业位置信息</p>
<el-form
ref="company_position_form"
:model="form"
class="company_position_form"
>
<el-form ref="company_position_form" :model="form" class="company_position_form">
<el-form-item label="省份名称">
<el-select
v-model="form.provinceName"
@change="checkCity"
placeholder="请选择省份名称"
>
<el-option
v-for="item in form.province"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
<el-select v-model="form.provinceName" @change="checkCity" placeholder="请选择省份名称">
<el-option v-for="item in form.province" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="城市名称">
<el-select
v-model="form.cityName"
@change="checkCounty"
placeholder="请选择城市名称"
>
<el-option
v-for="item in form.city"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
<el-select v-model="form.cityName" @change="checkCounty" placeholder="请选择城市名称">
<el-option v-for="item in form.city" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="区县名称">
<el-select
v-model="form.areaName"
@change="checkTown"
placeholder="请选择区县名称"
>
<el-option
v-for="item in form.county"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
<el-select v-model="form.areaName" @change="checkTown" placeholder="请选择区县名称">
<el-option v-for="item in form.county" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="街道/乡镇名称">
<el-select
v-model="form.blockName"
@change="checkCommunity"
placeholder="请选择街道/乡镇名称"
>
<el-option
v-for="item in form.township"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
<el-select v-model="form.blockName" @change="checkCommunity" placeholder="请选择街道/乡镇名称">
<el-option v-for="item in form.township" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="社区/村名称">
<el-select
v-model="form.streetName"
placeholder="请选择社区/村名称"
>
<el-option
v-for="item in form.community"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
<el-select v-model="form.streetName" placeholder="请选择社区/村名称">
<el-option v-for="item in form.community" :key="item.areaCode" :label="item.areaName"
:value="item.areaCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="企业地址">
<el-input v-model="form.companyAddress"></el-input>
<el-form-item>
</el-form-item>
<el-form-item label="经度">
<el-input v-model="form.longitude"></el-input>
@ -199,30 +122,25 @@
<el-form-item label="纬度">
<el-input v-model="form.latitude"></el-input>
</el-form-item>
<el-form-item>
</el-form-item>
<el-form-item label="企业地址">
<el-input v-model="form.companyAddress"></el-input>
</el-form-item>
</el-form>
</div>
<!-- 管辖区信息表单 -->
<div class="jurisdiction">
<p>管辖区信息</p>
<el-form
ref="jurisdiction_form"
:model="form"
class="jurisdiction_form"
>
<el-form ref="jurisdiction_form" :model="form" class="jurisdiction_form">
<el-form-item label="辖区派出所编码">
<el-input v-model="form.policeDistrictCode"></el-input>
</el-form-item>
<el-form-item label="辖区派出所名称">
<el-select
v-model="form.policeDistrictCn"
placeholder="请选择辖区派出所名称"
>
<el-option
v-for="item in form.jurisdiction"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
<el-select v-model="form.policeDistrictCn" placeholder="请选择辖区派出所名称">
<el-option v-for="item in form.jurisdiction" :key="item.dictValue" :label="item.dictLabel"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
@ -291,7 +209,7 @@ export default {
belongingArea: "",
},
imageUrl: "",
upUrl:`http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, //
upUrl: `http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, //
upheaders: {
Authorization: localStorage.getItem('AuthorizationToken')
}
@ -410,11 +328,11 @@ export default {
this.$emit("back");
},
handleAvatarSuccess(res, file) {
console.log('resimg',res);
console.log('fileimg',file);
// this.imageUrl = URL.createObjectURL(file.raw);
this.$message.success('上传成功')
},
console.log('resimg', res);
console.log('fileimg', file);
// this.imageUrl = URL.createObjectURL(file.raw);
this.$message.success('上传成功')
},
closeForm() {
this.visible = false;
},
@ -431,10 +349,12 @@ export default {
color: #fff;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
background-image: url("~@/assets/companyFile/dialogBack.png");
background-size: 100% 100%;
background-repeat: no-repeat;
height: 720px;
/* 关闭弹窗叉号 */
.el-dialog__headerbtn {
.el-dialog__close {
@ -442,10 +362,12 @@ export default {
font-size: 18px;
}
}
.el-dialog__body {
padding: 0px;
padding-left: 15px;
padding-right: 15px;
p {
padding-top: 15px;
margin-left: 17px;
@ -454,6 +376,7 @@ export default {
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
}
.el-button {
width: 70px;
border: 1px solid #4a6072;
@ -461,41 +384,49 @@ export default {
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
background: url("~@/assets/companyFile/btn05.png") no-repeat !important;
background-size: 100% 100% !important;
}
.form_body {
height: 600px;
overflow-y: scroll;
}
.form_body::-webkit-scrollbar {
width: 6px;
background-color: #5e666a;
border-radius: 4px;
}
.form_body::-webkit-scrollbar-thumb {
width: 5px;
background-color: #3c4b4a;
border-radius: 4px;
}
.el-form {
/* 表单内容浮动布局,多行多列表单 */
width: 900px !important;
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
.el-form-item {
/* 表单域名跟input浮动布局 */
display: flex;
width: 50%;
.el-form-item__label {
width: 50%;
text-align: center;
color: #fff;
}
.el-form-item__content {
.el-input__inner {
width: 170px;
@ -504,6 +435,7 @@ export default {
background: #3c4b4a;
color: #fff;
}
/* 查询框点击颜色变化 */
.el-input__inner:focus,
.el-input__inner:hover {
@ -512,6 +444,7 @@ export default {
}
}
}
.commerceMessage,
.company_person_message,
.company_position,
@ -519,16 +452,20 @@ export default {
background: url("~@/assets/companyFile/242112.png") no-repeat !important;
background-size: 100% 100% !important;
}
/* 为适应上传图片表单布局把企业工商表单拆分 */
.commerceMessage_one {
display: flex;
.avatar-uploader {
margin-left: 8%;
img {
width: 220px;
height: 220px;
}
}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
border-radius: 6px;
@ -536,9 +473,11 @@ export default {
position: relative;
overflow: hidden;
}
.avatar-uploader .el-upload:hover {
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
position: relative;
@ -547,6 +486,7 @@ export default {
height: 220px;
background: url("~@/assets/companyFile/uploadicon.png") center no-repeat !important;
background-size: 40% 40% !important;
div {
position: absolute;
top: 160px;
@ -554,28 +494,34 @@ export default {
font-size: 19px;
}
}
.avatar {
width: 178px;
height: 178px;
display: block;
}
.el-form.commerceMessage_form {
/* 表单内容flex布局多行多列表单 */
width: 600px !important;
}
}
/* 为适应上传图片表单布局把企业工商表单拆分,剩余样式 */
.el-form.commerceMessage_form_two {
.el-form-item {
width: 100%;
.el-form-item__label {
width: 14.5%;
}
.el-form-item__content {
.el-input__inner {
width: 760px;
}
}
.el-checkbox-group {
.el-checkbox {
.el-checkbox__label {
@ -583,16 +529,19 @@ export default {
padding-right: 10px;
}
}
.el-checkbox.is-checked {
background: #3c4b4a;
border-radius: 0px;
border: 0.5px dashed;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
.el-checkbox__inner {
display: none;
}
}
.el-textarea {
.el-textarea__inner {
height: 120px;
@ -603,6 +552,7 @@ export default {
border: 0.5px dashed;
color: #fff;
}
.el-textarea__inner:focus,
.el-textarea__inner:hover {
border-color: #1b3736;
@ -610,10 +560,12 @@ export default {
}
}
}
.el-form.company_position_form {
.el-form-item {
width: 31%;
margin-left: 15px;
.el-form-item__content {
.el-input__inner {
width: 170px;
@ -621,13 +573,17 @@ export default {
}
}
}
.el-form.jurisdiction_form {
margin-left: 15px;
.el-form-item {
width: 33%;
.el-form-item__label {
width: 50%;
}
.el-form-item__content {
.el-input__inner {
width: 170px;

Loading…
Cancel
Save