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

Merge pull request 'bug修改' (#49) from lukeyan into master

Browse Source 
Reviewed-on: #49
pull/50/head^2
lukeyan 1 year ago
parent da5627a9a7 091e404621
commit 316cc84164
7 changed files with 140 additions and 66 deletions
Show Stats Download Patch File Download Diff File

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

@ -51,7 +51,6 @@
class="avatar-uploader" class="avatar-uploader"
accept=".jpg,.jpeg,.png,.gif,.JPG,.JPEG" accept=".jpg,.jpeg,.png,.gif,.JPG,.JPEG"
:action="upUrl" :action="upUrl"
:headers="upheaders"
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
> >
@ -252,7 +251,7 @@ import {
postCompanyList, postCompanyList,
putCompanyList, putCompanyList,
} from "@/api/systemManagement"; } from "@/api/systemManagement";
import defaultImage from "@/assets/companyFile/defaultimage.png"; import defaultImage from "@/assets/companyFile/default.png";
export default { export default {
name: "CompanyDataDialog", name: "CompanyDataDialog",
data() { data() {
@ -311,7 +310,7 @@ export default {
belongingArea: "", belongingArea: "",
}, },
imageUrl: "", imageUrl: "",
upUrl: `http://172.18.113.50:8080/zhapi/safety/system/enterpriseList`, // 图片上传地址 upUrl: `http://${window.location.host}/zhapi/safety/system/enterpriseList`, // 图片上传地址
upheaders: { upheaders: {
Authorization: localStorage.getItem("AuthorizationToken"), Authorization: localStorage.getItem("AuthorizationToken"),
}, },
@ -379,9 +378,10 @@ export default {
policeDistrictCn: "", policeDistrictCn: "",
policeDistrictCode: "", policeDistrictCode: "",
belongingArea: "", belongingArea: "",
companyType:'',
companyTypes: [], // 非下拉List, 记录复选框的 companyTypes: [], // 非下拉List, 记录复选框的
values: [], values: [],
id: [], id: '',
}; };
this.imageUrl = ""; this.imageUrl = "";
Object.assign(this.form, newForm); 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; const params = this.form;
console.log("this.form3", this.form); console.log("this.form3", this.form);
if (this.dialogTitle === "新建") { if (this.dialogTitle === "新建") {
postCompanyList(params).then((res) => { await postCompanyList(params).then((res) => {
console.log(res); console.log(res);
this.$message.success("新建成功"); this.$message.success("新建成功");
this.visible = false; this.visible = false;
}); });
} else if (this.dialogTitle === "编辑") { } 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); console.log(res);
this.$message.success("编辑成功"); this.$message.success("编辑成功");
this.visible = false; this.visible = false;

33
src/views/systemManagement/companyList/index.vue
Unescape View File

@ -34,7 +34,7 @@
shewei: val == '剧毒' || val == '易制毒', shewei: val == '剧毒' || val == '易制毒',
zhongdian: val == '消防重点' || val == '所管消防', zhongdian: val == '消防重点' || val == '所管消防',
zhibao: val == '放射源' || val == '易制爆', zhibao: val == '放射源' || val == '易制爆',
zhian: val == '治安重点' || val == '创安单位', zhian: val == '治安重点' || val == '创安单位' || val == '外资合资',
}" v-for="(val, index) in item.companyTypes" :key="index"> }" v-for="(val, index) in item.companyTypes" :key="index">
{{ val }} {{ val }}
</div> </div>
@ -106,13 +106,13 @@ export default {
} }
}, },
// 请求数据 // 请求数据
getData() { async getData() {
const params = { const params = {
pageSize: this.pageSize, pageSize: this.pageSize,
pageNum: this.pageNum, pageNum: this.pageNum,
companyName: this.searchCompany, // 查询框条件 companyName: this.searchCompany, // 查询框条件
}; };
getCompanyList(params).then((res) => { await getCompanyList(params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
console.log("res.data", res); console.log("res.data", res);
this.company_data = res.data; this.company_data = res.data;
@ -303,12 +303,13 @@ export default {
color: #fff; color: #fff;
text-shadow: 0 0 9px #ffe6d9; text-shadow: 0 0 9px #ffe6d9;
left: 10px; left: 10px;
bottom: 70px; bottom: 100px;
font-size: 18px; font-size: 18px;
} }
.company_label { .company_label {
display: flex; display: flex;
flex-wrap: wrap;
position: absolute; position: absolute;
z-index: 2; z-index: 2;
left: 10px; left: 10px;
@ -317,7 +318,7 @@ export default {
.shewei { .shewei {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
width: auto; width: 60px;
background: url("~@/assets/companyFile/编组 11991.png") no-repeat; background: url("~@/assets/companyFile/编组 11991.png") no-repeat;
padding: 0 5px; padding: 0 5px;
font-size: 14px; font-size: 14px;
@ -325,13 +326,15 @@ export default {
letter-spacing: 0.44px; letter-spacing: 0.44px;
font-weight: 400; font-weight: 400;
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 10px; margin-right: 5px;
margin-bottom: 5px;
text-align: center;
} }
.zhongdian { .zhongdian {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
width: auto; width: 80px;
background: url("~@/assets/companyFile/编组 11222221.png") no-repeat; background: url("~@/assets/companyFile/编组 11222221.png") no-repeat;
padding: 0 5px; padding: 0 5px;
font-size: 14px; font-size: 14px;
@ -339,13 +342,15 @@ export default {
letter-spacing: 0.44px; letter-spacing: 0.44px;
font-weight: 400; font-weight: 400;
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 10px; margin-right: 5px;
margin-bottom: 5px;
text-align: center;
} }
.zhibao { .zhibao {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
width: auto; width: 60px;
background: url("~@/assets/companyFile/编组 11991备份 10.png") no-repeat; background: url("~@/assets/companyFile/编组 11991备份 10.png") no-repeat;
padding: 0 5px; padding: 0 5px;
font-size: 14px; font-size: 14px;
@ -353,13 +358,15 @@ export default {
letter-spacing: 0.44px; letter-spacing: 0.44px;
font-weight: 400; font-weight: 400;
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 10px; margin-right: 5px;
margin-bottom: 5px;
text-align: center;
} }
.zhian { .zhian {
height: 26px; height: 26px;
line-height: 26px; line-height: 26px;
width: auto; width: 80px;
background: url("~@/assets/companyFile/编组 11991备份 21.png") no-repeat; background: url("~@/assets/companyFile/编组 11991备份 21.png") no-repeat;
padding: 0 5px; padding: 0 5px;
font-size: 14px; font-size: 14px;
@ -367,7 +374,9 @@ export default {
letter-spacing: 0.44px; letter-spacing: 0.44px;
font-weight: 400; font-weight: 400;
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 10px; margin-right: 5px;
margin-bottom: 5px;
text-align: center;
} }
} }

91
src/views/systemManagement/correlationEquipment/components/addVideoDialog.vue
Unescape View File

@ -33,8 +33,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item> </el-form-item>
</el-form-item>
<el-form-item label="设备名称" prop="deviceName"> <el-form-item label="设备名称" prop="deviceName">
<el-input v-model="form.deviceName"></el-input> <el-input v-model="form.deviceName"></el-input>
</el-form-item> </el-form-item>
@ -168,7 +167,7 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div v-show="btn_flag" slot="footer" class="dialog-footer">
<el-button <el-button
@click=" @click="
saveFormData('equipmentForm', 'videoForm', 'addressForm', 'otherForm') saveFormData('equipmentForm', 'videoForm', 'addressForm', 'otherForm')
@ -264,9 +263,73 @@ export default {
{ required: true, message: "请输入安装位置", trigger: "blur" }, { required: true, message: "请输入安装位置", trigger: "blur" },
], ],
}, },
btn_flag: true, // 控制表单底部按钮显示与隐藏
}; };
}, },
created() { created() {
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 = Object.assign(this.form,row);
this.obtain_select_list()
this.btn_flag = true;
this.disabled = false;
} else if (num === "5") {
this.dialogTitle = "详情";
this.form = Object.assign(this.form,row);
this.obtain_select_list()
this.disabled = true;
this.btn_flag = false;
}
},
obtain_select_list() {
// 请求设备小类下拉 // 请求设备小类下拉
const params = { const params = {
dictType: "device_video_sub_type", dictType: "device_video_sub_type",
@ -293,20 +356,6 @@ export default {
this.form.company = res.data; this.form.company = res.data;
}); });
}, },
methods: {
open(num, row) {
this.visible = true;
if (num === "1") {
this.dialogTitle = "新建";
} else if (num === "2") {
this.dialogTitle = "编辑";
this.form = row;
} else if (num === "5") {
this.dialogTitle = "详情";
this.form = row;
this.disabled = true;
}
},
// 表单验证必填 // 表单验证必填
saveFormData: debounce(function (formName1, formName2, formName3) { saveFormData: debounce(function (formName1, formName2, formName3) {
this.$refs[formName1].validate((valid1) => { this.$refs[formName1].validate((valid1) => {
@ -353,13 +402,13 @@ export default {
this.visible = false; this.visible = false;
// 重置表单 // 重置表单
// 设备基础信息表单重置 // 设备基础信息表单重置
this.$refs['equipmentForm'].resetFields() this.$refs["equipmentForm"].resetFields();
// 视频通道信息表单重置 // 视频通道信息表单重置
this.$refs['videoForm'].resetFields() this.$refs["videoForm"].resetFields();
// 设备位置信息表单重置 // 设备位置信息表单重置
this.$refs['addressForm'].resetFields() this.$refs["addressForm"].resetFields();
// 设备其他信息表单重置 // 设备其他信息表单重置
this.$refs['otherForm'].resetFields() this.$refs["otherForm"].resetFields();
}, },
}, },
}; };

8
src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
Unescape View File

@ -7,7 +7,7 @@
<el-form :inline="true" :model="search" class="search_data"> <el-form :inline="true" :model="search" class="search_data">
<el-form-item> <el-form-item>
<el-input <el-input
v-model="search.equipemnt" v-model="search.equipment"
placeholder="输入设备名称搜索" placeholder="输入设备名称搜索"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input <el-input
v-model="search.equipemnt_ip" v-model="search.equipment_ip"
placeholder="输入设备IP搜索" placeholder="输入设备IP搜索"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -37,7 +37,7 @@
<el-form :inline="true" :model="search" class="search_data"> <el-form :inline="true" :model="search" class="search_data">
<el-form-item> <el-form-item>
<el-input <el-input
v-model="search.equipemnt" v-model="search.equipment"
placeholder="输入设备名称搜索" placeholder="输入设备名称搜索"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -375,7 +375,7 @@ export default {
width: calc(100% - 30px); width: calc(100% - 30px);
margin-top: 12px; margin-top: 12px;
margin-left: 12px; margin-left: 12px;
height: 30vh; height: 27vh;
.el-table, .el-table,
.el-table__expanded-cell { .el-table__expanded-cell {

4
src/views/systemManagement/correlationEquipment/components/searchBox.vue
Unescape View File

@ -155,7 +155,7 @@ export default {
this.pushValue.search_params = { this.pushValue.search_params = {
pageSize: 4, pageSize: 4,
pageNum: 1, 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) => { await getVideoList(this.pushValue.search_params).then((res) => {
console.log("resVideoList1", res.rows); console.log("resVideoList1", res.rows);
@ -171,7 +171,7 @@ export default {
this.pushValue.search_params = { this.pushValue.search_params = {
pageSize: 4, pageSize: 4,
pageNum: 1, 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) => { await getPerceptionList(this.pushValue.search_params).then((res) => {
// res.row传给右下方表格数据 // res.row传给右下方表格数据

8
src/views/systemManagement/correlationEquipment/index.vue
Unescape View File

@ -355,7 +355,7 @@ export default {
} }
// 没有展开且有子节点 // 没有展开且有子节点
.el-tree /deep/ .el-icon-caret-right:before { .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: ""; content: "";
display: block; display: block;
width: 23px; width: 23px;
@ -367,7 +367,7 @@ export default {
.el-tree .el-tree
/deep/ /deep/
.el-tree-node__expand-icon.expanded.el-icon-caret-right:before { .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: ""; content: "";
display: block; display: block;
width: 23px; width: 23px;
@ -375,9 +375,9 @@ export default {
font-size: 23px; font-size: 23px;
background-size: 23px; background-size: 23px;
} }
// 没有子节点 // 没有子节点 minus
.el-tree /deep/.el-tree-node__expand-icon.is-leaf::before { .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: ""; content: "";
display: block; display: block;
width: 23px; width: 23px;

2
src/views/systemManagement/safeIndex/components/indexmassageThree.vue
Unescape View File

@ -194,7 +194,7 @@ export default {
mounted() { mounted() {
bus.$on("send_three", (data) => { bus.$on("send_three", (data) => {
console.log("data", data); console.log("data", data);
this.tableData_all = [] this.tableData_all = [];
this.three_level_id = data.safeRuleId; // 根据传来的id找对应的三级数据 this.three_level_id = data.safeRuleId; // 根据传来的id找对应的三级数据
this.safeRuleId = data.safeRuleId; this.safeRuleId = data.safeRuleId;
this.table_num = data.table_num; // 1还是2 this.table_num = data.table_num; // 1还是2

Write Preview
Loading…
Cancel
Save