关联设备调试4

pull/31/head
lukeyan 1 year ago
parent e80611fdd7
commit 3a82dc90c9

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

@ -267,8 +267,8 @@ export default {
{ id: "8", label: "创安单位" }, { id: "8", label: "创安单位" },
{ id: "9", label: "外资合资" }, { id: "9", label: "外资合资" },
], ],
arr:[], arr: [],
cancel_arr:[], cancel_arr: [],
// //
form: { form: {
// //
@ -436,16 +436,18 @@ export default {
}, },
company_choice(e, item) { company_choice(e, item) {
// this.form.companyType // this.form.companyType
const company_arr = this.form.companyType.split(",") const company_arr = this.form.companyType.split(",");
if (e) { if (e) {
this.arr.push(item.id); this.arr.push(item.id);
company_arr.concat(this.arr) // company_arr.concat(this.arr); //
const new_arr = Array.from(new Set(company_arr.concat(this.arr))) // const new_arr = Array.from(new Set(company_arr.concat(this.arr))); //
const sort_arr = new_arr.sort() // const sort_arr = new_arr.sort(); //
this.form.companyType = sort_arr.toString() this.form.companyType = sort_arr.toString();
} else { } else {
company_arr.filter(val =>val != item.id) // company_arr.filter((val) => val != item.id); //
this.form.companyType = company_arr.filter(val =>val != item.id).toString() this.form.companyType = company_arr
.filter((val) => val != item.id)
.toString();
} }
}, },
// //
@ -493,7 +495,7 @@ export default {
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: 750px;
/* 关闭弹窗叉号 */ /* 关闭弹窗叉号 */
.el-dialog__headerbtn { .el-dialog__headerbtn {
@ -533,6 +535,7 @@ export default {
} }
.form_body { .form_body {
margin-top: 2.5vh;
height: 600px; height: 600px;
overflow-y: scroll; overflow-y: scroll;
} }
@ -592,7 +595,9 @@ 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 {
margin-top: -17px;
}
/* 为适应上传图片表单布局把企业工商表单拆分 */ /* 为适应上传图片表单布局把企业工商表单拆分 */
.commerceMessage_one { .commerceMessage_one {
display: flex; display: flex;

@ -75,7 +75,7 @@ import CompanyDataDialog from "./components/companyDataDialog";
import ClearDialog from "./components/clearDialog"; import ClearDialog from "./components/clearDialog";
import { getCompanyList } from "@/api/systemManagement"; import { getCompanyList } from "@/api/systemManagement";
import { debounce } from "@/utils/publicMethod_lxy/debounce.js"; import { debounce } from "@/utils/publicMethod_lxy/debounce.js";
import defaultImage from "@/assets/companyFile/defaultimage.png"; import defaultImage from "@/assets/companyFile/default.png";
export default { export default {
name: "companyList", name: "companyList",
components: { components: {
@ -448,23 +448,23 @@ export default {
} }
li:hover .shewei { li:hover .shewei {
opacity: 0; opacity: 1;
} }
li:hover .zhongdian { li:hover .zhongdian {
opacity: 0; opacity: 1;
} }
li:hover .zhibao { li:hover .zhibao {
opacity: 0; opacity: 1;
} }
li:hover .zhian { li:hover .zhian {
opacity: 0; opacity: 1;
} }
li:hover span { li:hover span {
opacity: 0; opacity: 1;
} }
} }
} }

@ -71,7 +71,7 @@
<!-- 表格 --> <!-- 表格 -->
<div class="equipment_data_table"> <div class="equipment_data_table">
<el-table <el-table
:cell-style="{ background: 'revert', 'text-align': 'center' }" :cell-style="{ background: 'revert' }"
:header-cell-style="table_header" :header-cell-style="table_header"
:data="pushTableData" :data="pushTableData"
:highlight-current-row="true" :highlight-current-row="true"
@ -107,7 +107,8 @@
:background="true" :background="true"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:page-sizes="[4]" :page-sizes="[4]"
:page-size="100" :page-size="PageSize"
:current-page="pageNum"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="pushTableData.length" :total="pushTableData.length"
> >
@ -136,6 +137,7 @@ export default {
}, },
props: { props: {
pushTableData: [], pushTableData: [],
only_params: {},
}, },
data() { data() {
return { return {
@ -176,6 +178,9 @@ export default {
// { prop: "latitude", label: "" }, // { prop: "latitude", label: "" },
{ prop: "orientationCn", label: "进出方向" }, { prop: "orientationCn", label: "进出方向" },
], ],
table_params: {}, //
pageSize: 4,
pageNum: 1,
total: 0, // total: 0, //
}; };
}, },
@ -193,70 +198,72 @@ export default {
this.tableColumn = this.tableColumn_preception; this.tableColumn = this.tableColumn_preception;
} }
this.pushTableData = data.pushTableData; this.pushTableData = data.pushTableData;
this.only_params = data.search_params; //
console.log("this.pushTableData", this.pushTableData);
this.search_params_table = data.search_params; this.search_params_table = data.search_params;
}); });
}, },
methods: { methods: {
// //
onSubmit() { onSubmit() {
const val = { this.only_params = {
pageSize: 4, pageSize: this.pageSize,
pageNum: 1, pageNum: this.pageNum,
deviceIp: this.search.ip, deviceIp: this.search.ip,
deviceName: this.search.equipment, deviceName: this.search.equipment,
}; };
getPerceptionList(val).then((res) => { Object.assign(this.only_params, this.search_params_table);
getPerceptionList(this.only_params).then((res) => {
// res.row // res.row
this.pushTableData = res.rows; this.pushTableData = res.rows;
}); });
}, },
//
reset() { reset() {
//
(this.search.equipment = ""), (this.search.ip = ""); (this.search.equipment = ""), (this.search.ip = "");
const val = { this.only_params = {
pageSize: 4, pageSize: this.pageSize,
pageNum: 1, pageNum: this.pageNum,
deviceIp: this.search.ip,
deviceName: this.search.equipment,
}; };
getPerceptionList(val).then((res) => { Object.assign(this.only_params, this.search_params_table);
if (res.code === 200) { getPerceptionList(this.only_params).then((res) => {
// res.row // res.row
this.pushTableData = res.rows; this.pushTableData = res.rows;
} else {
this.$message.warning("查询智能感知设备列表失败");
}
}); });
}, },
// //
onSubmitVideo() { onSubmitVideo() {
const val = { this.only_params = {
pageSize: 4, pageSize: this.pageSize,
pageNum: 1, pageNum: this.pageNum,
gbsChannelNo: this.search.channel_code, gbsChannelNo: this.search.channel_code,
deviceIp: this.search.equipemnt_ip, deviceIp: this.search.equipemnt_ip,
deviceName: this.search.equipment, deviceName: this.search.equipment,
}; };
Object.assign(val, this.search_params_table); Object.assign(this.only_params, this.search_params_table);
getVideoList(val).then((res) => { getVideoList(this.only_params).then((res) => {
// res.row // res.row
this.pushTableData = res.rows; this.pushTableData = res.rows;
}); });
}, },
//
resetVideo() { resetVideo() {
//
(this.search.channel_code = ""), (this.search.channel_code = ""),
(this.search.equipemnt_ip = ""), (this.search.equipemnt_ip = ""),
(this.search.equipment = ""); (this.search.equipment = "");
const val = { this.only_params = {
pageSize: 4, pageSize: this.pageSize,
pageNum: 1, pageNum: this.pageNum,
gbsChannelNo: this.search.channel_code, gbsChannelNo: this.search.channel_code,
deviceIp: this.search.equipemnt_ip, deviceIp: this.search.equipemnt_ip,
deviceName: this.search.equipment, deviceName: this.search.equipment,
}; };
Object.assign(val, this.search_params_table); Object.assign(this.only_params, this.search_params_table);
getVideoList(val).then((res) => { getVideoList(this.only_params).then((res) => {
// res.row // res.row
this.pushTableData = res.rows; this.pushTableData = res.rows;
}); });
}, },
openDialog(num, row) { openDialog(num, row) {
@ -297,11 +304,23 @@ export default {
console.log(row); console.log(row);
console.log(rowIndex); console.log(rowIndex);
return { return {
"text-align": "center",
color: "#fff", color: "#fff",
}; };
}, },
handleCurrentChange() {}, handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.only_params.pageNum = val
console.log('this.only_params', this.only_params);
if (this.table_title === "视频监控设备列表") {
getVideoList(this.only_params).then((res) => {
this.pushTableData = res.rows;
});
} else if (this.table_title === "智能感知设备列表") {
getPerceptionList(this.only_params).then((res) => {
this.pushTableData = res.rows;
});
}
},
}, },
}; };
</script> </script>
@ -356,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: 100%; height: 27vh;
.el-table, .el-table,
.el-table__expanded-cell { .el-table__expanded-cell {
@ -416,7 +435,7 @@ export default {
} }
.el-pagination { .el-pagination {
margin-left: 60%; margin-left: 50%;
/deep/.el-pagination__total { /deep/.el-pagination__total {
color: #fff; color: #fff;
} }

@ -41,6 +41,7 @@ export default {
}, },
types_params_list: [], // id types_params_list: [], // id
per_types_params_list: [], // id per_types_params_list: [], // id
back_types:'', //
}; };
}, },
created() {}, created() {},
@ -53,6 +54,8 @@ export default {
// //
console.log("item123", item); console.log("item123", item);
if (item === "1") { if (item === "1") {
this.back_types = item
this.$emit('backTypes', this.back_types) //
this.types_params_list.push(value); this.types_params_list.push(value);
this.pushValue.title = "视频监控设备列表"; this.pushValue.title = "视频监控设备列表";
// //
@ -68,6 +71,8 @@ export default {
this.pushValue.pushTableData = res.rows; this.pushValue.pushTableData = res.rows;
}); });
} else if (item === "2") { } else if (item === "2") {
this.back_types = item
this.$emit('backTypes', this.back_types) //
this.per_types_params_list.push(value); this.per_types_params_list.push(value);
this.pushValue.title = "智能感知设备列表"; this.pushValue.title = "智能感知设备列表";
this.pushValue.search_params = { this.pushValue.search_params = {
@ -92,6 +97,8 @@ export default {
// //
console.log("item123", item); console.log("item123", item);
if (item === "1") { if (item === "1") {
this.back_types = item
this.$emit('backTypes', this.back_types) //
console.log("this.types_params_list2", this.types_params_list); console.log("this.types_params_list2", this.types_params_list);
console.log("value", value); console.log("value", value);
this.types_params_list = this.types_params_list.filter( this.types_params_list = this.types_params_list.filter(
@ -112,6 +119,8 @@ export default {
this.pushValue.pushTableData = res.rows; this.pushValue.pushTableData = res.rows;
}); });
} else if (item === "2") { } else if (item === "2") {
this.back_types = item
this.$emit('backTypes', this.back_types) //
this.per_types_params_list = this.per_types_params_list.filter( this.per_types_params_list = this.per_types_params_list.filter(
(item) => item != value (item) => item != value
); );
@ -140,6 +149,8 @@ export default {
this.searchBoxData.company_types = []; this.searchBoxData.company_types = [];
if (num === "1") { if (num === "1") {
// //
this.back_types = num
this.$emit('backTypes', this.back_types) //
this.pushValue.title = "视频监控设备列表"; this.pushValue.title = "视频监控设备列表";
this.pushValue.search_params = { this.pushValue.search_params = {
pageSize: 4, pageSize: 4,
@ -153,6 +164,8 @@ export default {
}); });
} else if (num === "2") { } else if (num === "2") {
console.log("num123", num); console.log("num123", num);
this.back_types = num
this.$emit('backTypes', this.back_types) //
// //
this.pushValue.title = "智能感知设备列表"; this.pushValue.title = "智能感知设备列表";
this.pushValue.search_params = { this.pushValue.search_params = {

@ -40,23 +40,6 @@
:title="node.label" :title="node.label"
class="el-tree-node__label node-label" class="el-tree-node__label node-label"
> >
<!-- <span>
<img
v-if="
companyTreeData[0].children &&
companyTreeData[0].children.length > 0
"
src="@/assets/companyFile/minus.png"
style="width: 23px; height: 23px"
alt
/>
<img
v-else
src="@/assets/companyFile/add.png"
style="width: 23px; height: 23px"
alt
/>
</span> -->
{{ node.label }} {{ node.label }}
</span> </span>
</el-tree> </el-tree>
@ -72,6 +55,7 @@
ref="searchBox" ref="searchBox"
:searchBoxData="searchBox_left_text" :searchBoxData="searchBox_left_text"
@clearList="clearList('1')" @clearList="clearList('1')"
@backTypes="backTypes"
></SearchBox> ></SearchBox>
</div> </div>
<div class="intelligence"> <div class="intelligence">
@ -79,12 +63,14 @@
ref="searchBox" ref="searchBox"
:searchBoxData="searchBox_right_text" :searchBoxData="searchBox_right_text"
@clearList="clearList('2')" @clearList="clearList('2')"
@backTypes="backTypes"
></SearchBox> ></SearchBox>
</div> </div>
</div> </div>
<EquipmentTable <EquipmentTable
ref="equipmentTable" ref="equipmentTable"
:pushTableData="pushTableData" :pushTableData="pushTableData"
:only_params="only_params"
></EquipmentTable> ></EquipmentTable>
</div> </div>
</div> </div>
@ -95,7 +81,11 @@
<script> <script>
import SearchBox from "./components/searchBox.vue"; import SearchBox from "./components/searchBox.vue";
import EquipmentTable from "./components/equipmentTable.vue"; import EquipmentTable from "./components/equipmentTable.vue";
import { getAllData, getVideoList } from "@/api/correlationEquipment"; import {
getAllData,
getVideoList,
getPerceptionList,
} from "@/api/correlationEquipment";
export default { export default {
name: "correlationEquipment", name: "correlationEquipment",
components: { components: {
@ -114,30 +104,31 @@ export default {
searchBox_right_text: {}, searchBox_right_text: {},
pushTableData: [], pushTableData: [],
defaultExpandAll: true, // defaultExpandAll: true, //
obtain_types: "", //
only_params:{}, //
}; };
}, },
created() { created() {
// //
const params = { this.only_params = {
areaName: "宁波", areaName: "宁波",
}; };
getAllData(params).then((res) => { getAllData(this.only_params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
console.log("resning", res); console.log("resning", res);
// //
this.companyTreeData = res.data; this.companyTreeData = res.data;
console.log("this.companyTreeData1", this.companyTreeData); console.log("this.companyTreeData1", this.companyTreeData);
// //
const val = { this.only_params = {
pageSize: 4, pageSize: 4,
pageNum: 1, pageNum: 1,
deviceVideoSubTypes: "1,2,3,4,5,6,7,8,9",
}; };
getVideoList(val).then((res) => { getVideoList(this.only_params).then((res) => {
if (res.code === 200) { console.log("resVideoList", res.rows);
console.log("resVideoList", res.rows); // res.row
// res.row this.pushTableData = res.rows;
this.pushTableData = res.rows;
}
}); });
} else { } else {
this.$message.warning("企业名称查询失败"); this.$message.warning("企业名称查询失败");
@ -184,44 +175,49 @@ export default {
methods: { methods: {
// //
searchCom() { searchCom() {
const params = { this.only_params = {
areaName: this.searchCompany, areaName: this.searchCompany,
}; };
getAllData(params).then((res) => { getAllData(this.only_params).then((res) => {
if (res.code === 200) { //
console.log("res", res); this.companyTreeData = res.data;
// console.log("this.companyTreeData", this.companyTreeData);
this.companyTreeData = res.data;
console.log("this.companyTreeData", this.companyTreeData);
} else {
this.$message.warning("企业名称查询失败");
}
}); });
}, },
handleNodeClick(data) { handleNodeClick(data) {
console.log("data", data); console.log("data123", data);
// List // List
const params = { this.searchBox_right_text.company_types = []; //
pageSize: 4, this.searchBox_left_text.company_types = [];
pageNum: 1, if (this.obtain_types === "" || this.obtain_types === "1") {
deviceVideoSubType: data.subAreaCode, //
}; this.only_params = {
getVideoList(params).then((res) => { pageSize: 4,
if (res.code === 200) { pageNum: 1,
company_id: data.subAreaCode, //
deviceVideoSubTypes: "1,2,3,4,5,6,7,8,9",
};
getVideoList(this.only_params).then((res) => {
console.log("resVideoList", res.rows); console.log("resVideoList", res.rows);
// res.row // res.row
this.pushTableData = res.rows; this.pushTableData = res.rows;
} });
}); } else if (this.obtain_types === "2") {
// List //
// const paramsPerception = { this.only_params = {
// devicePerceptionSubType: data.subAreaCode, pageSize: 4,
// }; pageNum: 1,
// getPerceptionList(paramsPerception).then((res) => { company_id: data.subAreaCode, //
// if (res.code === 200) { devicePerceptionSubTypes: "1,2,3,4,6,7,8,10,11",
// console.log("resPerceptionList", res); };
// } getPerceptionList(this.only_params).then((res) => {
// }); if (res.code === 200) {
console.log("resVideoList", res.rows);
// res.row
this.pushTableData = res.rows;
}
});
}
}, },
clearList(num) { clearList(num) {
console.log("num", num); console.log("num", num);
@ -231,6 +227,10 @@ export default {
this.searchBox_left_text.company_types = []; this.searchBox_left_text.company_types = [];
} }
}, },
backTypes(num) {
console.log("num0000", num);
this.obtain_types = num;
},
}, },
}; };
</script> </script>
@ -267,8 +267,8 @@ export default {
.cardBodyLeft { .cardBodyLeft {
width: 25%; width: 25%;
height: 100%; height: 100%;
background: rgba(23, 36, 36, .4); background: rgba(23, 36, 36, 0.4);
border: 0.5px solid #485F6C; border: 0.5px solid #485f6c;
border-radius: 4px; border-radius: 4px;
.cardBodyLeft_search { .cardBodyLeft_search {
display: flex; display: flex;
@ -316,7 +316,7 @@ export default {
height: 69vh; height: 69vh;
.el-tree { .el-tree {
/* 树形数据过长添加滚动条 */ /* 树形数据过长添加滚动条 */
height: 100%; height: 95%;
overflow: auto; overflow: auto;
// box-shadow: 5px 5px 10px #126a58; // box-shadow: 5px 5px 10px #126a58;
border-radius: 4px; border-radius: 4px;
@ -414,8 +414,8 @@ export default {
width: 75%; width: 75%;
height: 100%; height: 100%;
border-radius: 4px; border-radius: 4px;
background: rgba(31, 45, 49, .4); background: rgba(31, 45, 49, 0.4);
border: 0.5px solid #485F6C; border: 0.5px solid #485f6c;
.cardBodyRight_search { .cardBodyRight_search {
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;

Loading…
Cancel
Save