ZheJiangNingBo
/
pingAnQiYeWeb
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

解决冲突

Browse Source
pull/21/head
lukeyan 2 years ago
parent cacf97c631 8ae1757e8d
commit 5bdfe0cb14
2 changed files with 91 additions and 135 deletions
Show Stats Download Patch File Download Diff File

18
src/views/archives/index.vue
Unescape View File

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

208
src/views/systemManagement/companyList/components/companyDataDialog.vue
Unescape View File

@ -1,23 +1,13 @@
<!-- 新增企业或者查看企业名单 --> <!-- 新增企业或者查看企业名单 -->
<template> <template>
<el-dialog <el-dialog class="dialog" :title="dialogTitle" :visible.sync="visible" :close-on-click-modal="false" width="970px">
class="dialog"
:title="dialogTitle"
:visible.sync="visible"
:close-on-click-modal="false"
width="970px"
>
<div class="form_body"> <div class="form_body">
<div class="commerceMessage"> <div class="commerceMessage">
<p>企业工商信息</p> <p>企业工商信息</p>
<!-- 为适应上传图片表单布局把企业工商表单拆分 --> <!-- 为适应上传图片表单布局把企业工商表单拆分 -->
<div class="commerceMessage_one"> <div class="commerceMessage_one">
<el-form <el-form ref="commerceMessage_form" :model="form" class="commerceMessage_form">
ref="commerceMessage_form" <el-form-item label="企业名称">
:model="form"
class="commerceMessage_form"
>
<el-form-item label="企业名称" prop="companyName">
<el-input v-model="form.companyName"></el-input> <el-input v-model="form.companyName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="统一社会信用代码" prop="socialCreditCode"> <el-form-item label="统一社会信用代码" prop="socialCreditCode">
@ -45,33 +35,17 @@
<el-input v-model="form.businessStatus"></el-input> <el-input v-model="form.businessStatus"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-upload <el-upload ref="upload" class="avatar-uploader" accept=".jpg,.jpeg,.png,.gif,.JPG,.JPEG" :action="upUrl"
ref="upload" :headers="upheaders" :show-file-list="false" :on-success="handleAvatarSuccess">
class="avatar-uploader" <img v-if="imageUrl" :src="imageUrl" class="avatar" @error="setDefaultImage" />
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 v-else class="avatar-uploader-icon">
<div>点击上传企业封面图片</div> <div>点击上传企业封面图片</div>
</div> </div>
</el-upload> </el-upload>
</div> </div>
<!-- 为适应上传图片表单布局把企业工商表单拆分,剩余部分 --> <!-- 为适应上传图片表单布局把企业工商表单拆分,剩余部分 -->
<el-form <el-form ref="commerceMessage_form_two" :model="form" class="commerceMessage_form_two">
ref="commerceMessage_form_two" <el-form-item label="企业登记注册地">
:model="form"
class="commerceMessage_form_two"
>
<el-form-item label="企业登记注册地" prop="registerAddress">
<el-input v-model="form.registerAddress"></el-input> <el-input v-model="form.registerAddress"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="企业类型" prop="companyTypes"> <el-form-item label="企业类型" prop="companyTypes">
@ -95,12 +69,8 @@
<!-- 企业联系人信息表单 --> <!-- 企业联系人信息表单 -->
<div class="company_person_message"> <div class="company_person_message">
<p>企业联系人信息</p> <p>企业联系人信息</p>
<el-form <el-form ref="company_person_message_form" :model="form" class="company_person_message_form">
ref="company_person_message_form" <el-form-item label="安全责任人">
:model="form"
class="company_person_message_form"
>
<el-form-item label="安全责任人" prop="emergencyContact">
<el-input v-model="form.emergencyContact"></el-input> <el-input v-model="form.emergencyContact"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任人电话" prop="emergencyContactPhone"> <el-form-item label="责任人电话" prop="emergencyContactPhone">
@ -111,87 +81,40 @@
<!-- 企业位置信息表单 --> <!-- 企业位置信息表单 -->
<div class="company_position"> <div class="company_position">
<p>企业位置信息</p> <p>企业位置信息</p>
<el-form <el-form ref="company_position_form" :model="form" class="company_position_form">
ref="company_position_form" <el-form-item label="省份名称">
:model="form" <el-select v-model="form.provinceName" @change="checkCity" placeholder="请选择省份名称">
class="company_position_form" <el-option v-for="item in form.province" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
>
<el-form-item label="省份名称" prop="provinceName">
<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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="城市名称" prop="cityName"> <el-form-item label="城市名称">
<el-select <el-select v-model="form.cityName" @change="checkCounty" placeholder="请选择城市名称">
v-model="form.cityName" <el-option v-for="item in form.city" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
@change="checkCounty"
placeholder="请选择城市名称"
>
<el-option
v-for="item in form.city"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="区县名称" prop="areaName"> <el-form-item label="区县名称">
<el-select <el-select v-model="form.areaName" @change="checkTown" placeholder="请选择区县名称">
v-model="form.areaName" <el-option v-for="item in form.county" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
@change="checkTown"
placeholder="请选择区县名称"
>
<el-option
v-for="item in form.county"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="街道/乡镇名称" prop="blockName"> <el-form-item label="街道/乡镇名称">
<el-select <el-select v-model="form.blockName" @change="checkCommunity" placeholder="请选择街道/乡镇名称">
v-model="form.blockName" <el-option v-for="item in form.township" :key="item.areaCode" :label="item.areaName" :value="item.areaCode">
@change="checkCommunity"
placeholder="请选择街道/乡镇名称"
>
<el-option
v-for="item in form.township"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区/村名称" prop="streetName"> <el-form-item label="社区/村名称">
<el-select <el-select v-model="form.streetName" placeholder="请选择社区/村名称">
v-model="form.streetName" <el-option v-for="item in form.community" :key="item.areaCode" :label="item.areaName"
placeholder="请选择社区/村名称" :value="item.areaCode">
>
<el-option
v-for="item in form.community"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="企业地址" prop="companyAddress"> <el-form-item>
<el-input v-model="form.companyAddress"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="经度" prop="longitude"> <el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude"></el-input> <el-input v-model="form.longitude"></el-input>
@ -199,30 +122,25 @@
<el-form-item label="纬度" prop="latitude"> <el-form-item label="纬度" prop="latitude">
<el-input v-model="form.latitude"></el-input> <el-input v-model="form.latitude"></el-input>
</el-form-item> </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> </el-form>
</div> </div>
<!-- 管辖区信息表单 --> <!-- 管辖区信息表单 -->
<div class="jurisdiction"> <div class="jurisdiction">
<p>管辖区信息</p> <p>管辖区信息</p>
<el-form <el-form ref="jurisdiction_form" :model="form" class="jurisdiction_form">
ref="jurisdiction_form" <el-form-item label="辖区派出所编码">
:model="form"
class="jurisdiction_form"
>
<el-form-item label="辖区派出所编码" prop="policeDistrictCode">
<el-input v-model="form.policeDistrictCode"></el-input> <el-input v-model="form.policeDistrictCode"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="辖区派出所名称" prop="policeDistrictCn"> <el-form-item label="辖区派出所名称">
<el-select <el-select v-model="form.policeDistrictCn" placeholder="请选择辖区派出所名称">
v-model="form.policeDistrictCn" <el-option v-for="item in form.jurisdiction" :key="item.dictValue" :label="item.dictLabel"
placeholder="请选择辖区派出所名称" :value="item.dictValue">
>
<el-option
v-for="item in form.jurisdiction"
:key="item.dictValue"
:label="item.dictLabel"
:value="item.dictValue"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -415,10 +333,10 @@ export default {
this.$emit("back"); this.$emit("back");
}, },
handleAvatarSuccess(res, file) { handleAvatarSuccess(res, file) {
console.log("resimg", res); console.log('resimg', res);
console.log("fileimg", file); console.log('fileimg', file);
// this.imageUrl = URL.createObjectURL(file.raw); // this.imageUrl = URL.createObjectURL(file.raw);
this.$message.success("上传成功"); this.$message.success('上传成功')
}, },
closeForm() { closeForm() {
this.visible = false; this.visible = false;
@ -436,10 +354,12 @@ export default {
color: #fff; color: #fff;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
} }
background-image: url("~@/assets/companyFile/dialogBack.png"); background-image: url("~@/assets/companyFile/dialogBack.png");
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
height: 720px; height: 720px;
/* 关闭弹窗叉号 */ /* 关闭弹窗叉号 */
.el-dialog__headerbtn { .el-dialog__headerbtn {
.el-dialog__close { .el-dialog__close {
@ -447,10 +367,12 @@ export default {
font-size: 18px; font-size: 18px;
} }
} }
.el-dialog__body { .el-dialog__body {
padding: 0px; padding: 0px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
p { p {
padding-top: 15px; padding-top: 15px;
margin-left: 17px; margin-left: 17px;
@ -459,6 +381,7 @@ export default {
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
} }
} }
.el-button { .el-button {
width: 70px; width: 70px;
border: 1px solid #4a6072; border: 1px solid #4a6072;
@ -466,41 +389,49 @@ export default {
border-radius: 0px !important; border-radius: 0px !important;
background: #323f43; background: #323f43;
} }
.el-button:focus, .el-button:focus,
.el-button:hover { .el-button:hover {
color: #34e1b3; color: #34e1b3;
background: url("~@/assets/companyFile/btn05.png") no-repeat !important; background: url("~@/assets/companyFile/btn05.png") no-repeat !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
.form_body { .form_body {
height: 600px; height: 600px;
overflow-y: scroll; overflow-y: scroll;
} }
.form_body::-webkit-scrollbar { .form_body::-webkit-scrollbar {
width: 6px; width: 6px;
background-color: #5e666a; background-color: #5e666a;
border-radius: 4px; border-radius: 4px;
} }
.form_body::-webkit-scrollbar-thumb { .form_body::-webkit-scrollbar-thumb {
width: 5px; width: 5px;
background-color: #3c4b4a; background-color: #3c4b4a;
border-radius: 4px; border-radius: 4px;
} }
.el-form { .el-form {
/* 表单内容浮动布局，多行多列表单 */ /* 表单内容浮动布局，多行多列表单 */
width: 900px !important; width: 900px !important;
display: flex; display: flex;
justify-content: flex-start; justify-content: flex-start;
flex-wrap: wrap; flex-wrap: wrap;
.el-form-item { .el-form-item {
/* 表单域名跟input浮动布局 */ /* 表单域名跟input浮动布局 */
display: flex; display: flex;
width: 50%; width: 50%;
.el-form-item__label { .el-form-item__label {
width: 50%; width: 50%;
text-align: center; text-align: center;
color: #fff; color: #fff;
} }
.el-form-item__content { .el-form-item__content {
.el-input__inner { .el-input__inner {
width: 170px; width: 170px;
@ -509,6 +440,7 @@ export default {
background: #3c4b4a; background: #3c4b4a;
color: #fff; color: #fff;
} }
/* 查询框点击颜色变化 */ /* 查询框点击颜色变化 */
.el-input__inner:focus, .el-input__inner:focus,
.el-input__inner:hover { .el-input__inner:hover {
@ -517,6 +449,7 @@ export default {
} }
} }
} }
.commerceMessage, .commerceMessage,
.company_person_message, .company_person_message,
.company_position, .company_position,
@ -524,16 +457,20 @@ export default {
background: url("~@/assets/companyFile/242112.png") no-repeat !important; background: url("~@/assets/companyFile/242112.png") no-repeat !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
/* 为适应上传图片表单布局把企业工商表单拆分 */ /* 为适应上传图片表单布局把企业工商表单拆分 */
.commerceMessage_one { .commerceMessage_one {
display: flex; display: flex;
.avatar-uploader { .avatar-uploader {
margin-left: 8%; margin-left: 8%;
img { img {
width: 220px; width: 220px;
height: 220px; height: 220px;
} }
} }
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;
@ -541,9 +478,11 @@ export default {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.avatar-uploader .el-upload:hover { .avatar-uploader .el-upload:hover {
border-color: #409eff; border-color: #409eff;
} }
.avatar-uploader-icon { .avatar-uploader-icon {
font-size: 28px; font-size: 28px;
position: relative; position: relative;
@ -552,6 +491,7 @@ export default {
height: 220px; height: 220px;
background: url("~@/assets/companyFile/uploadicon.png") center no-repeat !important; background: url("~@/assets/companyFile/uploadicon.png") center no-repeat !important;
background-size: 40% 40% !important; background-size: 40% 40% !important;
div { div {
position: absolute; position: absolute;
top: 160px; top: 160px;
@ -559,28 +499,34 @@ export default {
font-size: 19px; font-size: 19px;
} }
} }
.avatar { .avatar {
width: 178px; width: 178px;
height: 178px; height: 178px;
display: block; display: block;
} }
.el-form.commerceMessage_form { .el-form.commerceMessage_form {
/* 表单内容flex布局，多行多列表单 */ /* 表单内容flex布局，多行多列表单 */
width: 600px !important; width: 600px !important;
} }
} }
/* 为适应上传图片表单布局把企业工商表单拆分,剩余样式 */ /* 为适应上传图片表单布局把企业工商表单拆分,剩余样式 */
.el-form.commerceMessage_form_two { .el-form.commerceMessage_form_two {
.el-form-item { .el-form-item {
width: 100%; width: 100%;
.el-form-item__label { .el-form-item__label {
width: 14.5%; width: 14.5%;
} }
.el-form-item__content { .el-form-item__content {
.el-input__inner { .el-input__inner {
width: 760px; width: 760px;
} }
} }
.el-checkbox-group { .el-checkbox-group {
.el-checkbox { .el-checkbox {
.el-checkbox__label { .el-checkbox__label {
@ -588,16 +534,19 @@ export default {
padding-right: 10px; padding-right: 10px;
} }
} }
.el-checkbox.is-checked { .el-checkbox.is-checked {
background: #3c4b4a; background: #3c4b4a;
border-radius: 0px; border-radius: 0px;
border: 0.5px dashed; border: 0.5px dashed;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64); text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
} }
.el-checkbox__inner { .el-checkbox__inner {
display: none; display: none;
} }
} }
.el-textarea { .el-textarea {
.el-textarea__inner { .el-textarea__inner {
height: 120px; height: 120px;
@ -608,6 +557,7 @@ export default {
border: 0.5px dashed; border: 0.5px dashed;
color: #fff; color: #fff;
} }
.el-textarea__inner:focus, .el-textarea__inner:focus,
.el-textarea__inner:hover { .el-textarea__inner:hover {
border-color: #1b3736; border-color: #1b3736;
@ -615,10 +565,12 @@ export default {
} }
} }
} }
.el-form.company_position_form { .el-form.company_position_form {
.el-form-item { .el-form-item {
width: 31%; width: 31%;
margin-left: 15px; margin-left: 15px;
.el-form-item__content { .el-form-item__content {
.el-input__inner { .el-input__inner {
width: 170px; width: 170px;
@ -626,13 +578,17 @@ export default {
} }
} }
} }
.el-form.jurisdiction_form { .el-form.jurisdiction_form {
margin-left: 15px; margin-left: 15px;
.el-form-item { .el-form-item {
width: 33%; width: 33%;
.el-form-item__label { .el-form-item__label {
width: 50%; width: 50%;
} }
.el-form-item__content { .el-form-item__content {
.el-input__inner { .el-input__inner {
width: 170px; width: 170px;

Write Preview
Loading…
Cancel
Save