diff --git a/src/assets/companyFile/defaultimage.png b/src/assets/companyFile/defaultimage.png new file mode 100644 index 0000000..63091ee Binary files /dev/null and b/src/assets/companyFile/defaultimage.png differ diff --git a/src/views/systemManagement/companyList/components/companyDataDialog.vue b/src/views/systemManagement/companyList/components/companyDataDialog.vue index 7bfcfe7..2367b0e 100644 --- a/src/views/systemManagement/companyList/components/companyDataDialog.vue +++ b/src/views/systemManagement/companyList/components/companyDataDialog.vue @@ -46,13 +46,20 @@ - +
点击上传企业封面图片
@@ -183,15 +190,15 @@ + + + - - - @@ -238,6 +245,7 @@ import { postCompanyList, putCompanyList, } from "@/api/systemManagement"; +import defaultImage from "@/assets/companyFile/defaultimage.png"; export default { name: "CompanyDataDialog", data() { @@ -283,6 +291,10 @@ export default { belongingArea: "", }, imageUrl: "", + upUrl:`http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, // 图片上传地址 + upheaders: { + Authorization: localStorage.getItem('AuthorizationToken') + } }; }, created() { @@ -300,6 +312,7 @@ export default { } else if (num === 3) { this.dialogTitle = "编辑"; console.log("item", item); + this.imageUrl = item.picUrl; this.form = Object.assign(this.form, item); } }, @@ -397,9 +410,19 @@ 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('上传成功') + }, closeForm() { this.visible = false; - } + }, + setDefaultImage(e) { + // 加载失败默认图片 + e.target.src = defaultImage; + }, }, }; @@ -463,7 +486,7 @@ export default { /* 表单内容浮动布局，多行多列表单 */ width: 900px !important; display: flex; - justify-content: space-between; + justify-content: flex-start; flex-wrap: wrap; .el-form-item { /* 表单域名跟input浮动布局 */ @@ -502,6 +525,10 @@ export default { display: flex; .avatar-uploader { margin-left: 8%; + img { + width: 220px; + height: 220px; + } } .avatar-uploader .el-upload { border: 1px dashed #d9d9d9; @@ -534,7 +561,7 @@ export default { display: block; } .el-form.commerceMessage_form { - /* 表单内容浮动布局，多行多列表单 */ + /* 表单内容flex布局，多行多列表单 */ width: 600px !important; } } @@ -586,18 +613,25 @@ export default { } .el-form.company_position_form { .el-form-item { - width: 30%; + width: 31%; + margin-left: 15px; + .el-form-item__content { + .el-input__inner { + width: 170px; + } + } } } .el-form.jurisdiction_form { + margin-left: 15px; .el-form-item { - width: 30%; + width: 33%; .el-form-item__label { - width: 70%; + width: 50%; } .el-form-item__content { .el-input__inner { - width: 150px; + width: 170px; } } } diff --git a/src/views/systemManagement/companyList/index.vue b/src/views/systemManagement/companyList/index.vue index e2ff6a5..caa149d 100644 --- a/src/views/systemManagement/companyList/index.vue +++ b/src/views/systemManagement/companyList/index.vue @@ -13,7 +13,6 @@
- 关键词:
  • - + {{ item.companyName }}
    {{ val }}
    - {{ item.companyAddress }} + + {{ item.companyAddress }}
    - + @@ -86,6 +91,7 @@ import CompanyDataDialog from "./components/companyDataDialog"; import ClearDialog from "./components/clearDialog"; import { getCompanyList } from "@/api/systemManagement"; import { debounce } from "@/utils/publicMethod_lxy/debounce.js"; +import defaultImage from "@/assets/companyFile/defaultimage.png"; export default { name: "companyList", components: { @@ -160,8 +166,12 @@ export default { this.getData(); }, jump() { - this.$router.push('/home/archives') - } + this.$router.push("/home/archives"); + }, + setDefaultImage(e) { + // 加载失败默认图片 + e.target.src = defaultImage; + }, }, }; @@ -197,18 +207,13 @@ export default { display: flex; justify-content: space-between; .top_search { + margin-left: 2vw; display: flex; width: 40%; height: 40px; - span { - width: 15%; - line-height: 40px; - text-align: center; - color: #fff; - } .top_search_input ::v-deep { /* 查询框 */ - width: 75%; + width: 60%; .el-input__inner { border-radius: 4px 0px 0px 4px; background: #3c4b4a; @@ -268,22 +273,18 @@ export default { flex-wrap: wrap; padding-left: 0px; li { - display: flex; - justify-content: center; - align-items: center; margin-left: 2.5%; position: relative; list-style: none; - width: 30%; - height: 47%; + width: 25.6vw; + height: 31vh; background: #1b3736; border: 1px solid #fff; - box-sizing: border-box; img { - margin-left: 0.5%; - margin-top: 0.6%; - width: 99%; - height: 98%; + margin-left: 0.3vw; + margin-top: 0.5vh; + width: 25vw; + height: 30vh; } /* 公司图片相关信息区域 */ .company_name { @@ -301,15 +302,63 @@ export default { z-index: 2; left: 10px; bottom: 35px; - .company_label_data { - text-align: center; - line-height: 30px; - padding: 0px 5px 0px 5px; - height: 30px; - color: #34e1b3; - background: url("~@/assets/companyFile/btn04.png") no-repeat !important; - background-size: 100% 100% !important; - margin-right: 5px; + .shewei { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11991.png") no-repeat; + padding: 0 5px; + font-size: 14px; + color: #b5ebff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; + } + + .zhongdian { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11222221.png") + no-repeat; + padding: 0 5px; + font-size: 14px; + color: #e3deff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; + } + + .zhibao { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11991备份 10.png") + no-repeat; + padding: 0 5px; + font-size: 14px; + color: #e3deff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; + } + + .zhian { + height: 26px; + line-height: 26px; + width: auto; + background: url("~@/assets/companyFile/编组 11991备份 21.png") + no-repeat; + padding: 0 5px; + font-size: 14px; + color: #e3deff; + letter-spacing: 0.44px; + font-weight: 400; + background-size: 100% 100%; + margin-right: 10px; } } .company_unit { @@ -377,7 +426,16 @@ export default { opacity: 1; cursor: default; } - li:hover .company_label_data { + li:hover .shewei { + opacity: 0; + } + li:hover .zhongdian { + opacity: 0; + } + li:hover .zhibao { + opacity: 0; + } + li:hover .zhian { opacity: 0; } li:hover span { diff --git a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue index 07b7f95..7c860b4 100644 --- a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue +++ b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue @@ -18,7 +18,7 @@ :disabled="disabled" > - + - + - - + + - - + + @@ -162,7 +162,12 @@
    - 保 存 + 保 存 取 消
    @@ -230,7 +235,7 @@ export default { deviceIp: [ { required: true, message: "请填写设备ip", trigger: "blur" }, ], - deviceParentType: [ + deviceVideoParentType: [ { required: true, message: "请选择设备大类", trigger: "change" }, ], deviceVideoSubType: [ @@ -288,50 +293,48 @@ export default { } else if (num === "5") { this.dialogTitle = "详情"; this.form = row; - this.disabled = true + this.disabled = true; } }, - saveFormData: debounce(function (formName1,formName2,formName3) { + saveFormData: debounce(function (formName1, formName2, formName3) { this.$refs[formName1].validate((valid1) => { - console.log('valid1',valid1); if (valid1) { - this.$message.warning("请填入必填项"); + this.$refs[formName2].validate((valid2) => { + if (valid2) { + this.$refs[formName3].validate((valid3) => { + if (valid3) { + delete this.form.company; + delete this.form.video_type; + delete this.form.perception_type; + delete this.form.orientation_types; + this.form.companyId = this.$refs.companySelect.selected.value // 企业对应id + const params = this.form; + console.log("this.form", this.form); + if (this.dialogTitle === "新建") { + addVideoList(params) + .then((res) => { + this.visible = false; + this.$message({ + message: res.msg, + type: "success", + }); + }) + .catch((err) => { + console.log(err); //代码错误、请求失败捕获 + }); + } + } else { + this.$message.warning("请填入必填项"); + } + }); // 视频通道信息必填验证 + } else { + this.$message.warning("请填入必填项"); + } + }); // 视频通道信息必填验证 } else { - return false; - } - }); // 设备基础必填验证 - this.$refs[formName2].validate((valid2) => { - console.log('valid2',valid2); - if (valid2) { this.$message.warning("请填入必填项"); - } else { - return false; } - }); // 视频通道信息必填验证 - this.$refs[formName3].validate((valid3) => { - console.log('valid3',valid3); - if (valid3) { - this.$message.warning("请填入必填项"); - } else { - return false; - } - }); // 视频通道信息必填验证 - delete this.form.company; - delete this.form.video_type; - delete this.form.perception_type; - delete this.form.orientation_types; - const params = this.form; - console.log("this.form", this.form); - if (this.dialogTitle === "新建") { - addVideoList(params).then((res) => { - console.log("res78", res); - if (res.code === 200) { - this.visible = false; - } else { - this.$message.warning("新建失败"); - } - }); - } + }); // 设备基础必填验证 }, 300), }, };