From 091e4046215ce03116915c2ef23f40b9d7736a50 Mon Sep 17 00:00:00 2001 From: lukeyan <1727408482@qq.com> Date: Tue, 23 May 2023 09:00:24 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/companyDataDialog.vue | 32 +++-- .../systemManagement/companyList/index.vue | 33 +++-- .../components/addVideoDialog.vue | 119 ++++++++++++------ .../components/equipmentTable.vue | 8 +- .../components/searchBox.vue | 4 +- .../correlationEquipment/index.vue | 8 +- .../components/indexmassageThree.vue | 2 +- 7 files changed, 140 insertions(+), 66 deletions(-) diff --git a/src/views/systemManagement/companyList/components/companyDataDialog.vue b/src/views/systemManagement/companyList/components/companyDataDialog.vue index 9611b10..4f918d1 100644 --- a/src/views/systemManagement/companyList/components/companyDataDialog.vue +++ b/src/views/systemManagement/companyList/components/companyDataDialog.vue @@ -51,7 +51,6 @@ class="avatar-uploader" accept=".jpg,.jpeg,.png,.gif,.JPG,.JPEG" :action="upUrl" - :headers="upheaders" :show-file-list="false" :on-success="handleAvatarSuccess" > @@ -252,7 +251,7 @@ import { postCompanyList, putCompanyList, } from "@/api/systemManagement"; -import defaultImage from "@/assets/companyFile/defaultimage.png"; +import defaultImage from "@/assets/companyFile/default.png"; export default { name: "CompanyDataDialog", data() { @@ -311,7 +310,7 @@ export default { belongingArea: "", }, imageUrl: "", - upUrl: `http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, // 图片上传地址 + upUrl: `http://${window.location.host}/zhapi/safety/system/enterpriseList`, // 图片上传地址 upheaders: { Authorization: localStorage.getItem("AuthorizationToken"), }, @@ -379,9 +378,10 @@ export default { policeDistrictCn: "", policeDistrictCode: "", belongingArea: "", + companyType:'', companyTypes: [], // 非下拉List, 记录复选框的 values: [], - id: [], + id: '', }; this.imageUrl = ""; Object.assign(this.form, newForm); @@ -477,17 +477,33 @@ export default { } }, // 确定数据 - saveFormData() { + async saveFormData() { + delete this.form.city + delete this.form.community + delete this.form.companyTypes + delete this.form.county + delete this.form.township + delete this.form.jurisdiction + delete this.form.province + delete this.form.values const params = this.form; console.log("this.form3", this.form); if (this.dialogTitle === "新建") { - postCompanyList(params).then((res) => { + await postCompanyList(params).then((res) => { console.log(res); this.$message.success("新建成功"); this.visible = false; }); } else if (this.dialogTitle === "编辑") { - putCompanyList(params).then((res) => { + // const params_again = { + // // pageSize: this.pageSize, + // // pageNum: this.pageNum, + // companyName: this.searchCompany, // 查询框条件 + // }; + // await getCompanyList(params_again).then(res=>{ + // console.log('res_again',res); + // }) + await putCompanyList(params).then((res) => { console.log(res); this.$message.success("编辑成功"); this.visible = false; @@ -653,7 +669,7 @@ export default { font-size: 28px; position: relative; color: #8c939d; - width: 220px; + width: 220px; height: 220px; background: url("~@/assets/companyFile/uploadicon.png") center no-repeat !important; background-size: 40% 40% !important; diff --git a/src/views/systemManagement/companyList/index.vue b/src/views/systemManagement/companyList/index.vue index 0c054e4..8b35a01 100644 --- a/src/views/systemManagement/companyList/index.vue +++ b/src/views/systemManagement/companyList/index.vue @@ -34,7 +34,7 @@ shewei: val == '剧毒' || val == '易制毒', zhongdian: val == '消防重点' || val == '所管消防', zhibao: val == '放射源' || val == '易制爆', - zhian: val == '治安重点' || val == '创安单位', + zhian: val == '治安重点' || val == '创安单位' || val == '外资合资', }" v-for="(val, index) in item.companyTypes" :key="index"> {{ val }} @@ -106,13 +106,13 @@ export default { } }, // 请求数据 - getData() { + async getData() { const params = { pageSize: this.pageSize, pageNum: this.pageNum, companyName: this.searchCompany, // 查询框条件 }; - getCompanyList(params).then((res) => { + await getCompanyList(params).then((res) => { if (res.code === 200) { console.log("res.data", res); this.company_data = res.data; @@ -303,12 +303,13 @@ export default { color: #fff; text-shadow: 0 0 9px #ffe6d9; left: 10px; - bottom: 70px; + bottom: 100px; font-size: 18px; } .company_label { display: flex; + flex-wrap: wrap; position: absolute; z-index: 2; left: 10px; @@ -317,7 +318,7 @@ export default { .shewei { height: 26px; line-height: 26px; - width: auto; + width: 60px; background: url("~@/assets/companyFile/编组 11991.png") no-repeat; padding: 0 5px; font-size: 14px; @@ -325,13 +326,15 @@ export default { letter-spacing: 0.44px; font-weight: 400; background-size: 100% 100%; - margin-right: 10px; + margin-right: 5px; + margin-bottom: 5px; + text-align: center; } .zhongdian { height: 26px; line-height: 26px; - width: auto; + width: 80px; background: url("~@/assets/companyFile/编组 11222221.png") no-repeat; padding: 0 5px; font-size: 14px; @@ -339,13 +342,15 @@ export default { letter-spacing: 0.44px; font-weight: 400; background-size: 100% 100%; - margin-right: 10px; + margin-right: 5px; + margin-bottom: 5px; + text-align: center; } .zhibao { height: 26px; line-height: 26px; - width: auto; + width: 60px; background: url("~@/assets/companyFile/编组 11991备份 10.png") no-repeat; padding: 0 5px; font-size: 14px; @@ -353,13 +358,15 @@ export default { letter-spacing: 0.44px; font-weight: 400; background-size: 100% 100%; - margin-right: 10px; + margin-right: 5px; + margin-bottom: 5px; + text-align: center; } .zhian { height: 26px; line-height: 26px; - width: auto; + width: 80px; background: url("~@/assets/companyFile/编组 11991备份 21.png") no-repeat; padding: 0 5px; font-size: 14px; @@ -367,7 +374,9 @@ export default { letter-spacing: 0.44px; font-weight: 400; background-size: 100% 100%; - margin-right: 10px; + margin-right: 5px; + margin-bottom: 5px; + text-align: center; } } diff --git a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue index b16d9fb..73f155c 100644 --- a/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue +++ b/src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue @@ -33,8 +33,7 @@ - - + @@ -168,7 +167,7 @@ -
+
{ - this.form.video_type = res.data; - }); - const val = { - dictType: "device_perception_sub_type", - }; - // 请求设备大类下拉 - commonDict(val).then((res) => { - this.form.perception_type = res.data; - }); - // 请求设备方位下拉 - const param_op = { - dictType: "orientation", - }; - commonDict(param_op).then((res) => { - this.form.orientation_types = res.data; - }); - // 请求企业名称下拉 - getCompanyList().then((res) => { - this.form.company = res.data; - }); + this.obtain_select_list(); }, methods: { open(num, row) { this.visible = true; if (num === "1") { this.dialogTitle = "新建"; + (this.form = { + // 设备基础信息表单 + companyId: "", + companyName: "", + company: [], + deviceName: "", + deviceIp: "", + deviceVideoParentType: "", + deviceParentType: "", // 大类 + video_type: [], + deviceVideoSubType: "", // 小类 + perception_type: [], + account: "", + password: "", + // 视频通道信息表单 + gbsChannelNo: "", + gbsNvrNo: "", + channelNo: "", + rtspAddress: "", + // 设备位置信息表单 + longitude: "", + latitude: "", + u3dLongitude: "", + u3dLatitude: "", + deviceHeight: "", + u3dHeight: "", + orientation: "", + orientation_types: [], + deviceAddress: "", + // 设备其他信息表单 + deviceBrand: "", + manufactor: "", + manufactorPhone: "", + deviceSn: "", + deviceMac: "", + devicePort: "", + isDoorwayVideo: "", + isShowVideo: "", + }), + this.obtain_select_list()((this.btn_flag = true)); + this.disabled = false; } else if (num === "2") { this.dialogTitle = "编辑"; - this.form = row; + this.form = Object.assign(this.form,row); + this.obtain_select_list() + this.btn_flag = true; + this.disabled = false; } else if (num === "5") { this.dialogTitle = "详情"; - this.form = row; + this.form = Object.assign(this.form,row); + this.obtain_select_list() this.disabled = true; + this.btn_flag = false; } }, + obtain_select_list() { + // 请求设备小类下拉 + const params = { + dictType: "device_video_sub_type", + }; + commonDict(params).then((res) => { + this.form.video_type = res.data; + }); + const val = { + dictType: "device_perception_sub_type", + }; + // 请求设备大类下拉 + commonDict(val).then((res) => { + this.form.perception_type = res.data; + }); + // 请求设备方位下拉 + const param_op = { + dictType: "orientation", + }; + commonDict(param_op).then((res) => { + this.form.orientation_types = res.data; + }); + // 请求企业名称下拉 + getCompanyList().then((res) => { + this.form.company = res.data; + }); + }, // 表单验证必填 saveFormData: debounce(function (formName1, formName2, formName3) { this.$refs[formName1].validate((valid1) => { @@ -353,13 +402,13 @@ export default { this.visible = false; // 重置表单 // 设备基础信息表单重置 - this.$refs['equipmentForm'].resetFields() + this.$refs["equipmentForm"].resetFields(); // 视频通道信息表单重置 - this.$refs['videoForm'].resetFields() - // 设备位置信息表单重置 - this.$refs['addressForm'].resetFields() + this.$refs["videoForm"].resetFields(); + // 设备位置信息表单重置 + this.$refs["addressForm"].resetFields(); // 设备其他信息表单重置 - this.$refs['otherForm'].resetFields() + this.$refs["otherForm"].resetFields(); }, }, }; diff --git a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue index 15a27c1..aad2816 100644 --- a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue +++ b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue @@ -7,7 +7,7 @@ @@ -21,7 +21,7 @@ @@ -37,7 +37,7 @@ @@ -375,7 +375,7 @@ export default { width: calc(100% - 30px); margin-top: 12px; margin-left: 12px; - height: 30vh; + height: 27vh; .el-table, .el-table__expanded-cell { diff --git a/src/views/systemManagement/correlationEquipment/components/searchBox.vue b/src/views/systemManagement/correlationEquipment/components/searchBox.vue index b8d1040..b8ddc3f 100644 --- a/src/views/systemManagement/correlationEquipment/components/searchBox.vue +++ b/src/views/systemManagement/correlationEquipment/components/searchBox.vue @@ -155,7 +155,7 @@ export default { this.pushValue.search_params = { pageSize: 4, pageNum: 1, - deviceVideoSubTypes: "1,2,3,4,5,6,7,8,9", + // deviceVideoSubTypes: "1,2,3,4,5,6,7,8,9", }; await getVideoList(this.pushValue.search_params).then((res) => { console.log("resVideoList1", res.rows); @@ -171,7 +171,7 @@ export default { this.pushValue.search_params = { pageSize: 4, pageNum: 1, - devicePerceptionSubTypes: "1,2,3,4,6,7,8,10,11", + // devicePerceptionSubTypes: "1,2,3,4,6,7,8,10,11", }; await getPerceptionList(this.pushValue.search_params).then((res) => { // res.row传给右下方表格数据 diff --git a/src/views/systemManagement/correlationEquipment/index.vue b/src/views/systemManagement/correlationEquipment/index.vue index 7aff8e4..139e0bf 100644 --- a/src/views/systemManagement/correlationEquipment/index.vue +++ b/src/views/systemManagement/correlationEquipment/index.vue @@ -355,7 +355,7 @@ export default { } // 没有展开且有子节点 .el-tree /deep/ .el-icon-caret-right:before { - background: url("~@/assets/companyFile/minus.png") no-repeat; + background: url("~@/assets/companyFile/add.png") no-repeat; content: ""; display: block; width: 23px; @@ -367,7 +367,7 @@ export default { .el-tree /deep/ .el-tree-node__expand-icon.expanded.el-icon-caret-right:before { - background: url("~@/assets/companyFile/minus.png") no-repeat; + background: url("~@/assets/companyFile/add.png") no-repeat; content: ""; display: block; width: 23px; @@ -375,9 +375,9 @@ export default { font-size: 23px; background-size: 23px; } - // 没有子节点 + // 没有子节点 minus .el-tree /deep/.el-tree-node__expand-icon.is-leaf::before { - background: url("~@/assets/companyFile/add.png") no-repeat; + background: url("~@/assets/companyFile/minus.png") no-repeat; content: ""; display: block; width: 23px; diff --git a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue index 07a3abf..81eaccb 100644 --- a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue +++ b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue @@ -194,7 +194,7 @@ export default { mounted() { bus.$on("send_three", (data) => { console.log("data", data); - this.tableData_all = [] + this.tableData_all = []; this.three_level_id = data.safeRuleId; // 根据传来的id找对应的三级数据 this.safeRuleId = data.safeRuleId; this.table_num = data.table_num; // 1还是2