uh)
z-7!j6?_GAgnH_VF?)(Z;Q)|0z;{Dihbor{~hMjn=R!+om;_4cJV$mp@p3ooIp*vPb
zKq!^al?yq%zP{AF*%{C5NR@KBI~ZG4is~Em=k_>w&RRhSPiMR7=(bIe3SSVE2~a8^
zY(C*^AUDVr0AbQh8e$JC%^QXQJS6FEc8&yHm;I
zTCnwQK0yl$$)ojyvf~6<8T23NBM@a9Vn`=QqI_zZH#gn>JjBWa9{z?lXNTT+|?V053X(G0Y(^Y7H>IPUVRB(NWHa~XXH@E5^pk8iwr>UiKiWua*gRBj-q*VZnaPZ{Xw`D<;
z?apZx4U0M#Ym;;IzOcTy)Ynr>5gFCD5Qd0eNZ@f|+yYadFo7s~hO~P^y;o`(JQh!F
zm2>Akcz1_v!sc{$sKrL*gsoU>dK@9TJN-xdGbKZq*0#z42pL(>v4EYS`K>5TZGeWz
z5&?>h85%ch=YhCq`VTl;`-9U)R}w3xalsBnVH>F!`%5CG@}
z!nmb-T{rbgjK_Iq`GnSO6@kz#^|i>0BVD-0wpKFwG^o6(B#R8G145Ard9}^~RFtJF
zmS#*?%IWSb>t619g)=K@LsJ7=LrW6|dIxB^c6NMY76*Qi%2kRgG1)
zVl7a97&o3JfZX7+1MgTu=KYXHC&&_cZuK&LA-aFdx;tGRX!G3A$#%sM)Z6%Bf*8vk
zVB3Zz>li1Yo7dP#8^@a%92>u@xO^C=qxwhy72=SG{h_^rYWw8C5Uqz9FPKx9zjV+T
z3gZp833ENk+2So8AZegkvx{&Pr=3)_00QIdNTogF;2E5Deuz@js;477Fl&!Z2PX+c
z*p&y1$*|NLb8VrzAXjm>(u{wp1N2h!rj1ue(lS=zZvp9BXEGVB&9Bw_ss+$@zIrEn
z&pWoVC!c?o{orRmWv}ml%PLQN84gkfi_Y5Jn?o#$PiXlYn{hh%wC==uQHhlh7~Q=_
z+FQf!Np{Ns0(!M7(-O+yYLu~wF@7@HHCJtA`0alE5A44QNYA|Zf?+S4n`(xYS!
z1Zg2;b8CnuN$E(J6n^%ONAxlVjX$(=svV*I@3Rb`=GGQE=00o0rkVG%pQN~
zd3JgX_H&XX2ds0zGJvcn>79^A2Kv~c{vNirtJ^SBVOogy?zdmg-nscw_R9Xf?9msW
zV?8I18-{no0}JOczY}$FgTVZ9g~=+QlPnbqtwG9G%DS*TWhuZt1
zjpy^<{+=W35sJ6>$N}L!=W48QP*{}CJ~g8xOXk?K<%f;Xg0X2@{$5D}c&BK8wS41M
zZJzifXMwV6!+ZI@R0Ubp1L)O*Z?O|2!)$5$BFo=zL-!hn-*K|pd+hhmu@~R?14|@x
zCjp;&W4Gn>N(yN2d|ydf=pQ)5*g#29YbKIqC4!$h@;HH@6k6V~gneq;4eYMZ{S|xP
zrSD*ka)bL)*jUwZY63tnyuOEx)2Y~{()^Y-cEi^9vb#V375340eSo!N%V9~91H^%v
z08l&;XHUJdtLzWnK)VNBbMY1IZ*TuH>t5Pfc6u@a|8t-w0EExh`%{dGXR>3PP6ANX9+kj?A^_#XtRs(=_wX26iND51qXtOVD3&Xno`vifQH9L
zX|nVUn(H}F!vf>mBrQLGW#1d@={+y91HDIc0tR$eN#+EQ4^_hf+ORWeR2a(u8XFns
zhrmV+j-xPofoI%d??x*ee?9MUO8|m3!hb&Wb2c!XdwQB@$|E!42@Y5u10CIWl-6>X
z-%p
zV~0&!HdYO*AcbJ2lTT06e32fF(hApqxbI%}*EfBJgJ}P2Z?Oj-`K?}1=~hD=uq=V9
zjVCY=Ju{iRlg-3bgfD48S+OArx@)0ewvB-n@4G*_myJ(OvhRHD8|=gH`#`m^MV6;X
z4%94wU|s#>%em$~m}nJaAFLtz^ar=IJ9ga6!6f)PbY_H0q7mA>-c=CAW|%TH&XmbB
zOo@y!B}&U3q$*u}mWo|#7C_)QEDFTh9jpg=_SKg%AL6ZJhdIE`S+$n^`Sx58VR^(S
zzjy~bLq}7(0U~8)iYYVG1eo-61m%@>?q|w0Nl@XI$+^67lLIvkpy`WC1Z{j`WWz^5Qf4c=@J`FG
zTD%W#zWS=2wODXb=KZ}#7#7_@8YR)P=h5CH2U%0NkzKOs0=|lLAFWme^&C9PhDS!&
zu2)`W+unT*yXxXg*}vcSQ)jz42v%Q~IeH;?vDD@+LEfhDYk
zGg@^aECJ}u=`q%OsE=>*Z3_ozPNtdE;;YYIW$V7jw&cwqkzITD82B)@@9-i1GYn9M
zM@k9O)LYy*1aM^
zT6y4$a;0Dqk+zDMt1I+H5vnqimLyPBmRuG}a=;1)6lJD){d&W#Y9)ZIFj0o7Sq{)>
zZIui1>1JCaIWT8@qNCNF55Uni~
zQ2J*%KsAP<
z-L?ezXSp5iq$uorou{ZpRMS&1;FVsG@p$xNl0ZRp#~@KukYu}T93X>RZt#Me
z0F_tb6OgyjPm@!gUHK=E19KPzrrmz`o!6z3sqNIcxQr^rGWxiUdGV_Hk;*(xWgevJ
zze@=yKmYz$zV#~tQ5pvNMc;h=wqrDQ=!P%F;~g^&m~?P1VJJ}~BK!@*dL@1!aQU7G
zAKH~Jg1qQ(U=DzE!bqnA9Jug?54}AVkG}+vpbI8QJZk}y@gtDnKf-6ic`QC@b!I3P8#%(0){F%WRLa-$)j}#M0gjD9My2p&Z*$g
zh7)OUAksvg_8FjrJ9mTh67j{m$t~kY;WA+}@vO(EoUPchqpwGfnEP8bPh_+PJtkim$r!_&kgjU=$D5jR+D@KP}Rx
zNA)ki$vojD+>^gwgd;bEKsumgLir-Uk$-eKAOWPy7VD0wWa7)bvhyfZnW;9afJiG0
zs6q-5%Y`*c@OQ|+qEZs`WPZf{1-uTP^qq^t1XTzv(;Qk(u
z&sgBri*NbxLMuF}wJ;JuC4TYEJFeeCvg9KWB)m%mz))WeH7uU(@NsoqJ|4*{&VZ
z@Nj%;2AUF)#Met?RaHlm04m}0a@B4!`L85zIRAL(Dh(V+6#PKAa)62Z^p!3gWE@nu
z$3Kt9rvsP2aM2CdZbIHAWjP=Ll;wrxyUjOz=+ji8ETqrLZde9CGluCRZht0WBv~qs^5Y+05KqqjiqO!+0YeoZ#6coJpt-^i
z;Xnu@;%M)MpVm!;gP&*OGiBA%jT;W0c}?u6~VA>tDXR_15d>qYRQHfQqUE7jD1q76K2}PGQu-K_H|965lW?Qp?6B6F=b=7)5cfIs?ltoW<|D<;IU}W-Rd_1rI@E#)S%C
z1dPz1w1D9N5pGC2?TuRsqlT-3`0EY~4~7QcJn$4RSPlP?0J8A$w|wkli;}VElLUc9
zqVgjemn?)3xPerFkYq{&Om)lk*ZTQ9{#BiuHoi9aCLNGe!z9N*1wQ`PojXIRc;tRU
zM>h`&k;1!g0E~K%E5M^dN;THxK576SPW9(e`5yruq~+82XeoZM`Nj`#L|JQ4ohqqzCcB00E&GGV#cnH%2k@u`Tzbi(BO
z_x$wNHMhHy1Q4&{xqqOh9gC!XOI7_cUi+zrr|W*^iWvD7pW}u805DlUu(-%9lfDY@zzqt5EEw`6kj5_)pOO;c=ftPCq~DYQr5ct(^4D{ys`1l#&v}0Z
z;}au7l*Jo6H=R9y)j8)s+yCa9CZ{8(Gw<_@`ZauBh;p;P<+dI3l4G;~OttcsOj@EA
zlLIA49%T($n%dl5#@jlgt(1(aL&
z-1lHr@9LuqpmX1`c_&Mpn9FKyTZ6(c5D2_#QtOQ0857zzq&i*ZI41
z=7EwdVQ{9p8(EU?kR0$22T0B~%;~nAJT}val != item.id) // 点击取消选中复选框时删除对应的
- this.form.companyType = company_arr.filter(val =>val != item.id).toString()
+ company_arr.filter((val) => val != item.id); // 点击取消选中复选框时删除对应的
+ 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-size: 100% 100%;
background-repeat: no-repeat;
- height: 720px;
+ height: 750px;
/* 关闭弹窗叉号 */
.el-dialog__headerbtn {
@@ -533,6 +535,7 @@ export default {
}
.form_body {
+ margin-top: 2.5vh;
height: 600px;
overflow-y: scroll;
}
@@ -592,7 +595,9 @@ export default {
background: url("~@/assets/companyFile/242112.png") no-repeat !important;
background-size: 100% 100% !important;
}
-
+ .commerceMessage {
+ margin-top: -17px;
+ }
/* 为适应上传图片表单布局把企业工商表单拆分 */
.commerceMessage_one {
display: flex;
diff --git a/src/views/systemManagement/companyList/index.vue b/src/views/systemManagement/companyList/index.vue
index 3400191..91a3c5b 100644
--- a/src/views/systemManagement/companyList/index.vue
+++ b/src/views/systemManagement/companyList/index.vue
@@ -75,7 +75,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";
+import defaultImage from "@/assets/companyFile/default.png";
export default {
name: "companyList",
components: {
@@ -448,23 +448,23 @@ export default {
}
li:hover .shewei {
- opacity: 0;
+ opacity: 1;
}
li:hover .zhongdian {
- opacity: 0;
+ opacity: 1;
}
li:hover .zhibao {
- opacity: 0;
+ opacity: 1;
}
li:hover .zhian {
- opacity: 0;
+ opacity: 1;
}
li:hover span {
- opacity: 0;
+ opacity: 1;
}
}
}
diff --git a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
index 2826cc3..236d078 100644
--- a/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
+++ b/src/views/systemManagement/correlationEquipment/components/equipmentTable.vue
@@ -71,7 +71,7 @@
@@ -136,6 +137,7 @@ export default {
},
props: {
pushTableData: [],
+ only_params: {},
},
data() {
return {
@@ -176,6 +178,9 @@ export default {
// { prop: "latitude", label: "设备维度" },
{ prop: "orientationCn", label: "进出方向" },
],
+ table_params: {}, // 本页面查询入参
+ pageSize: 4,
+ pageNum: 1,
total: 0, // 信息总数
};
},
@@ -193,70 +198,72 @@ export default {
this.tableColumn = this.tableColumn_preception;
}
this.pushTableData = data.pushTableData;
+ this.only_params = data.search_params; // 如果点击了标签查询
+ console.log("this.pushTableData", this.pushTableData);
this.search_params_table = data.search_params;
});
},
methods: {
// 智能搜索
onSubmit() {
- const val = {
- pageSize: 4,
- pageNum: 1,
+ this.only_params = {
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
deviceIp: this.search.ip,
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传给右下方表格数据
this.pushTableData = res.rows;
});
},
+ // 智能搜索重置
reset() {
- // 重置
(this.search.equipment = ""), (this.search.ip = "");
- const val = {
- pageSize: 4,
- pageNum: 1,
+ this.only_params = {
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
+ deviceIp: this.search.ip,
+ deviceName: this.search.equipment,
};
- getPerceptionList(val).then((res) => {
- if (res.code === 200) {
- // res.row传给右下方表格数据
- this.pushTableData = res.rows;
- } else {
- this.$message.warning("查询智能感知设备列表失败");
- }
+ Object.assign(this.only_params, this.search_params_table);
+ getPerceptionList(this.only_params).then((res) => {
+ // res.row传给右下方表格数据
+ this.pushTableData = res.rows;
});
},
// 视频搜索
onSubmitVideo() {
- const val = {
- pageSize: 4,
- pageNum: 1,
+ this.only_params = {
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
gbsChannelNo: this.search.channel_code,
deviceIp: this.search.equipemnt_ip,
deviceName: this.search.equipment,
};
- Object.assign(val, this.search_params_table);
- getVideoList(val).then((res) => {
+ Object.assign(this.only_params, this.search_params_table);
+ getVideoList(this.only_params).then((res) => {
// res.row传给右下方表格数据
this.pushTableData = res.rows;
});
},
+ // 视频搜索重置
resetVideo() {
- // 重置
(this.search.channel_code = ""),
(this.search.equipemnt_ip = ""),
(this.search.equipment = "");
- const val = {
- pageSize: 4,
- pageNum: 1,
+ this.only_params = {
+ pageSize: this.pageSize,
+ pageNum: this.pageNum,
gbsChannelNo: this.search.channel_code,
deviceIp: this.search.equipemnt_ip,
deviceName: this.search.equipment,
};
- Object.assign(val, this.search_params_table);
- getVideoList(val).then((res) => {
- // res.row传给右下方表格数据
- this.pushTableData = res.rows;
+ Object.assign(this.only_params, this.search_params_table);
+ getVideoList(this.only_params).then((res) => {
+ // res.row传给右下方表格数据
+ this.pushTableData = res.rows;
});
},
openDialog(num, row) {
@@ -297,11 +304,23 @@ export default {
console.log(row);
console.log(rowIndex);
return {
- "text-align": "center",
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;
+ });
+ }
+ },
},
};
@@ -356,7 +375,7 @@ export default {
width: calc(100% - 30px);
margin-top: 12px;
margin-left: 12px;
- height: 100%;
+ height: 27vh;
.el-table,
.el-table__expanded-cell {
@@ -416,7 +435,7 @@ export default {
}
.el-pagination {
- margin-left: 60%;
+ margin-left: 50%;
/deep/.el-pagination__total {
color: #fff;
}
diff --git a/src/views/systemManagement/correlationEquipment/components/searchBox.vue b/src/views/systemManagement/correlationEquipment/components/searchBox.vue
index 684283e..b8d1040 100644
--- a/src/views/systemManagement/correlationEquipment/components/searchBox.vue
+++ b/src/views/systemManagement/correlationEquipment/components/searchBox.vue
@@ -41,6 +41,7 @@ export default {
},
types_params_list: [], // 选中视频企业类型对应的id
per_types_params_list: [], // 选中智能企业类型对应的id
+ back_types:'', // 通知树形,是视频检索还是智能检索
};
},
created() {},
@@ -53,6 +54,8 @@ export default {
// 切换表格标题
console.log("item123", item);
if (item === "1") {
+ this.back_types = item
+ this.$emit('backTypes', this.back_types) // 通知树形
this.types_params_list.push(value);
this.pushValue.title = "视频监控设备列表";
// 根据企业标签查询视频数据
@@ -68,6 +71,8 @@ export default {
this.pushValue.pushTableData = res.rows;
});
} else if (item === "2") {
+ this.back_types = item
+ this.$emit('backTypes', this.back_types) // 通知树形
this.per_types_params_list.push(value);
this.pushValue.title = "智能感知设备列表";
this.pushValue.search_params = {
@@ -92,6 +97,8 @@ export default {
// 切换表格标题
console.log("item123", item);
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("value", value);
this.types_params_list = this.types_params_list.filter(
@@ -112,6 +119,8 @@ export default {
this.pushValue.pushTableData = res.rows;
});
} 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(
(item) => item != value
);
@@ -140,6 +149,8 @@ export default {
this.searchBoxData.company_types = [];
if (num === "1") {
// 视频监控全标签查
+ this.back_types = num
+ this.$emit('backTypes', this.back_types) // 通知树形
this.pushValue.title = "视频监控设备列表";
this.pushValue.search_params = {
pageSize: 4,
@@ -153,6 +164,8 @@ export default {
});
} else if (num === "2") {
console.log("num123", num);
+ this.back_types = num
+ this.$emit('backTypes', this.back_types) // 通知树形
// 智能感知全标签查
this.pushValue.title = "智能感知设备列表";
this.pushValue.search_params = {
diff --git a/src/views/systemManagement/correlationEquipment/index.vue b/src/views/systemManagement/correlationEquipment/index.vue
index 528da9a..f577fc6 100644
--- a/src/views/systemManagement/correlationEquipment/index.vue
+++ b/src/views/systemManagement/correlationEquipment/index.vue
@@ -40,23 +40,6 @@
:title="node.label"
class="el-tree-node__label node-label"
>
-
{{ node.label }}
@@ -72,6 +55,7 @@
ref="searchBox"
:searchBoxData="searchBox_left_text"
@clearList="clearList('1')"
+ @backTypes="backTypes"
>
@@ -79,12 +63,14 @@
ref="searchBox"
:searchBoxData="searchBox_right_text"
@clearList="clearList('2')"
+ @backTypes="backTypes"
>
@@ -95,7 +81,11 @@
@@ -267,8 +267,8 @@ export default {
.cardBodyLeft {
width: 25%;
height: 100%;
- background: rgba(23, 36, 36, .4);
- border: 0.5px solid #485F6C;
+ background: rgba(23, 36, 36, 0.4);
+ border: 0.5px solid #485f6c;
border-radius: 4px;
.cardBodyLeft_search {
display: flex;
@@ -316,7 +316,7 @@ export default {
height: 69vh;
.el-tree {
/* 树形数据过长添加滚动条 */
- height: 100%;
+ height: 95%;
overflow: auto;
// box-shadow: 5px 5px 10px #126a58;
border-radius: 4px;
@@ -414,8 +414,8 @@ export default {
width: 75%;
height: 100%;
border-radius: 4px;
- background: rgba(31, 45, 49, .4);
- border: 0.5px solid #485F6C;
+ background: rgba(31, 45, 49, 0.4);
+ border: 0.5px solid #485f6c;
.cardBodyRight_search {
display: flex;
justify-content: space-evenly;