Skip to content

Z
zh-baseversion-project
Commit a7ddacbe authored by 纪泽龙's avatar 纪泽龙
Browse files
Options

Merge branch 'jzl'

parents 019b5da0 9a2b75e9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 478 additions and 351 deletions
zh-baseversion-web/src/assets/styles/all.scss
View file @ a7ddacbe
......@@ -77,6 +77,9 @@
}
.bigwindow {
.el-table__header {
width: 350px !important;
}
// 全局表格样式
.el-table {
......@@ -93,6 +96,23 @@
}
.el-table__body-wrapper {
.el-table__body {
border-spacing: 0 5px;
font-size: 14px;
td:nth-child(4) .cell {
text-align: center;
}
}
.el-table__row {
width: 100%;
// display: block;
vertical-align: 5px;
height: 36px;
width: 350px;
}
.el-table__row:nth-child(2n + 1) {
background-color: #e6e6e6;
......@@ -166,13 +186,21 @@
.el-table__header-wrapper,
.el-table__fixed-header-wrapper {
tr {
background-color: #213b52 !important;
// background-color: #213b52 !important;
background: rgba(9, 101, 172, 0.56) !important;
}
th {
word-break: break-word;
background-color: #213b52 !important;
color: rgba(123, 248, 244, 1);
// background-color: #213b52 !important;
// color: rgba(123, 248, 244, 1);
background: rgba(9, 101, 172, 0.56) !important;
box-sizing: border-box;
border: 1px solid rgba(54, 136, 255, 0.2392);
color: #fff;
height: 30px;
font-size: 13px;
padding: 0;
......@@ -184,8 +212,9 @@
}
.el-table__body-wrapper {
.el-table__row:nth-child(2n + 1) {
background-color: rgb(11 22 37);
background-color: #062A45;
&:hover td {
background-color: #7bf8f430 !important;
......@@ -194,13 +223,18 @@
td {
.cell {
// color: #525252;
color: rgba(123, 248, 244, 1);
// color: rgba(123, 248, 244, 1);
line-height: 14px;
color: #fff;
}
}
}
.el-table__row:nth-child(2n) {
background-color: #213b52;
// background-color: #213b52;
background-color: #062A45;
&:hover td {
background-color: #7bf8f430 !important;
......@@ -208,6 +242,7 @@
td {
.cell {
line-height: 14px;
color: #fff;
}
}
......@@ -610,6 +645,7 @@
}
.el-table__body-wrapper {
.el-table__row:nth-child(2n + 1) {
background-color: #e6e6e6;
......@@ -846,7 +882,7 @@
.gdt {
&::-webkit-scrollbar {
width: 10px;
background: #012a53;
......
zh-baseversion-web/src/utils/mapClass/config.js
View file @ a7ddacbe
/*
* @Author: your name
* @Date: 2022-01-26 10:47:44
* @LastEditTime: 2024-07-18 17:36:58
* @LastEditTime: 2024-07-19 10:38:10
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/config.js
......@@ -37,6 +37,9 @@ export const svgUrl = {
6: require("@/assets/firstimage/device/jmUser.png"),
// 商业用户
61:require("@/assets/firstimage/device/syUser.png"),
// 工业用户
62:require("@/assets/firstimage/device/syUser.png"),
7: require("@/assets/image/zrxk.svg"),
8: require("@/assets/image/zcrq.svg"),
......
zh-baseversion-web/src/utils/mapClass/map.js
View file @ a7ddacbe
/*
* @Author: your name
* @Date: 2022-01-11 13:45:12
* @LastEditTime: 2024-07-18 17:07:55
* @LastEditTime: 2024-07-19 14:59:20
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/utils/mapClass.js
......@@ -167,31 +167,29 @@ export class EditorMap {
}
}
});
this.map.on("moveend", () => {
console.log("地图停止移动");
if (this.flag) {
console.log("弹框");
this.flag = false;
}
//居民用户
this.map.on("mousedown", () => {
console.log("mapONMousedown");
if (this.detectorUserlabelsLayer != null) {
const detectorUserHas = this.selarr.indexOf(6) >= 0;
if (detectorUserHas) {
this.detectorUserlabelsLayer.show();
this.detectorUserlabelsLayer.hide();
}
}
//商业用户
if (this.businessDetectorUserlabelsLayer != null) {
const businessDetectorUserHas = this.selarr.indexOf(61) >= 0;
if (businessDetectorUserHas) {
this.businessDetectorUserlabelsLayer.show();
this.businessDetectorUserlabelsLayer.hide();
}
}
// 调压箱
if (this.tyxlabelsLayer != null) {
const tyxHas = this.selarr.indexOf(2) >= 0;
if (tyxHas) {
this.tyxlabelsLayer.show();
this.tyxlabelsLayer.hide();
}
}
......@@ -199,7 +197,7 @@ export class EditorMap {
if (this.fmjlabelLayer != null) {
const fmjHas = this.selarr.indexOf(3) >= 0;
if (fmjHas) {
this.fmjlabelLayer.show();
this.fmjlabelLayer.hide();
}
}
......@@ -207,7 +205,7 @@ export class EditorMap {
if (this.czlabelLayer != null) {
const czHas = this.selarr.indexOf(4) >= 0;
if (czHas) {
this.czlabelLayer.show();
this.czlabelLayer.hide();
}
}
......@@ -215,7 +213,7 @@ export class EditorMap {
if (this.videolabelLayer != null) {
const videoHas = this.selarr.indexOf(5) >= 0;
if (videoHas) {
this.videolabelLayer.show();
this.videolabelLayer.hide();
}
}
......@@ -223,34 +221,31 @@ export class EditorMap {
if (this.deviceUserlableLayer != null) {
const deviceUserHas = this.selarr.indexOf(18) >= 0;
if (deviceUserHas) {
this.deviceUserlableLayer.show();
this.deviceUserlableLayer.hide();
}
}
});
this.map.on("movestart", () => {
console.log("地图开始移动");
this.map.on("mouseup", () => {
//居民用户
if (this.detectorUserlabelsLayer != null) {
const detectorUserHas = this.selarr.indexOf(6) >= 0;
if (detectorUserHas) {
this.detectorUserlabelsLayer.hide();
this.detectorUserlabelsLayer.show();
}
}
//商业用户
if (this.businessDetectorUserlabelsLayer != null) {
const businessDetectorUserHas = this.selarr.indexOf(61) >= 0;
if (businessDetectorUserHas) {
this.businessDetectorUserlabelsLayer.hide();
this.businessDetectorUserlabelsLayer.show();
}
}
// 调压箱
if (this.tyxlabelsLayer != null) {
const tyxHas = this.selarr.indexOf(2) >= 0;
if (tyxHas) {
this.tyxlabelsLayer.hide();
this.tyxlabelsLayer.show();
}
}
......@@ -258,7 +253,7 @@ export class EditorMap {
if (this.fmjlabelLayer != null) {
const fmjHas = this.selarr.indexOf(3) >= 0;
if (fmjHas) {
this.fmjlabelLayer.hide();
this.fmjlabelLayer.show();
}
}
......@@ -266,7 +261,7 @@ export class EditorMap {
if (this.czlabelLayer != null) {
const czHas = this.selarr.indexOf(4) >= 0;
if (czHas) {
this.czlabelLayer.hide();
this.czlabelLayer.show();
}
}
......@@ -274,7 +269,7 @@ export class EditorMap {
if (this.videolabelLayer != null) {
const videoHas = this.selarr.indexOf(5) >= 0;
if (videoHas) {
this.videolabelLayer.hide();
this.videolabelLayer.show();
}
}
......@@ -282,10 +277,22 @@ export class EditorMap {
if (this.deviceUserlableLayer != null) {
const deviceUserHas = this.selarr.indexOf(18) >= 0;
if (deviceUserHas) {
this.deviceUserlableLayer.hide();
this.deviceUserlableLayer.show();
}
}
});
this.map.on("moveend", () => {
console.log("地图停止移动");
if (this.flag) {
console.log("弹框");
this.flag = false;
}
});
this.map.on("movestart", () => {
console.log("地图开始移动");
return;
//居民用户
});
// this.map.on('zoomchange', () => {
// //获取当前最新的地图层级
// let Zoom = this.map.getZoom()
......@@ -1368,10 +1375,12 @@ export class EditorMap {
});
}
console.log(this.allDevice);
// return;
for (let deviceItem in this.allDevice) {
this.allDevice[deviceItem].forEach((device) => {
const data = device.filterData || device.getExtData();
console.log(data.iconType);
console.log("data", data.filterData);
// console.log(data.iconType);
// 设备过滤受到bigwindow页面的的两种制约，companyArr, typeArr 两个数组制约显示隐藏
// 燃气没有公司，所以没有device.companyType不收到公司的控制
const companyHas = companyArr.indexOf(data.companyType + "") >= 0;
......@@ -1382,8 +1391,10 @@ export class EditorMap {
// 必须设备存在数组里，才会显示设备 !data.companyType代表用户不受公司制约
if (enterprise || (deviceHas && (companyHas || !data.companyType))) {
device.show();
// console.log(data.iconType,companyHas,deviceHas,enterprise,'show')
} else {
device.hide();
// console.log(data.iconType,companyHas,deviceHas,enterprise,"hide")
}
});
}
......@@ -1409,7 +1420,7 @@ export class EditorMap {
}
}
//判断是否需要显示 调压箱
// 判断是否需要显示 调压箱
const tyxHas = typeArr.indexOf(2) >= 0;
if (this.tyxlabelsLayer != null) {
if (tyxHas) {
......@@ -1419,7 +1430,7 @@ export class EditorMap {
}
}
//判断是否需要显示 阀门井
// 判断是否需要显示 阀门井
const fmjHas = typeArr.indexOf(3) >= 0;
if (this.fmjlabelLayer != null) {
if (fmjHas) {
......
zh-baseversion-web/src/views/bigWindow/components/Top.vue
View file @ a7ddacbe
......@@ -47,13 +47,12 @@
<div
class="devie-item zzz"
v-for="item in searchList"
:key="item.id+''+item.type"
:key="item.id + '' + item.type"
@click="deviceItemClick(item)"
>
<!-- {{ item.NAME }} -->
<div class="a">{{ devviceData[item.type] }}</div>
<div class="b">{{ item.NAME }}</div>
</div>
</div>
</transition>
......@@ -138,11 +137,11 @@ export default {
}
},
searchClick() {
this.searchItemShow = true;
searchDevice({ name: this.searchVal }).then((res) => {
if (res.code == 200) {
this.searchList = Object.values(res.data).flat();
this.searchItemShow = true;
console.log(this.searchList);
}
});
......@@ -150,10 +149,28 @@ export default {
deviceItemClick(item) {
searchDeviceDetail({ type: item.type, id: item.id }).then((res) => {
if (res.code == 200) {
if (res.data.length == 0) return;
this.$emit("deviceSearchClick",item, res.data[0]);
let dataArr = null;
console.log(res)
// 1.阀井
// 2.调压箱
// 3.场站
// 4.居民用户
// 5.商业用户
// 6.工业用户
// 7.监控
// 8.餐饮单位液化气用户
// 9.管道
// 1,2,3的时候 是res.data.data才能获取数据，结构为数组。
// 4，5 是 res.data就能获取数据，结构为数组
// 7,8，9的时候，res.data能获取数据，结构为对象
// if (item.type == 1 || item.type == 2 || item.type == 3) {
// dataArr = res.data.data;
// }else if(item.type == 4 || item.type == 5 || item.type == 6){
// }
// if (dataArr.length == 0) return;
// this.$emit("deviceSearchClick", item, res);
}
console.log(res);
});
},
clearSearchContainer() {
......
zh-baseversion-web/src/views/bigWindow/index.vue
View file @ a7ddacbe
<!--
* @Author: your name
* @Date: 2022-01-11 13:44:17
* @LastEditTime: 2024-07-18 17:27:20
* @LastEditTime: 2024-07-19 16:18:43
* @LastEditors: 纪泽龙 jizelong@qq.com
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: /test/hello-world/src/views/Home.vue
......@@ -49,12 +49,13 @@
<!-- 头部 -->
<div class="banner-test">
<!-- <dv-decoration-5 style="width:100%;height:100%;" /> -->
<img
<!-- <img
v-if="this.enterpriseId == -2"
src="../../assets/images/zibk.png"
alt=""
/>
<img v-else src="../../assets/images/20230805152711.png" alt="" />
<img v-else src="../../assets/images/20230805152711.png" alt="" /> -->
智慧燃气安全监管平台
</div>
<!-- 左边 -->
......@@ -397,21 +398,27 @@ export default {
GetCompany: "bigWindowCompany/GetCompany",
}),
// 搜索设备上图功能
deviceSearchClick(device,deviceDetail){
console.log(device,deviceDetail)
deviceSearchClick(device, deviceDetail) {
console.log(device, deviceDetail);
// let Company =null;
// if(){
// }
// this.goMap(getEnterprise, this.addDevice, Company, true);
},
leftRightBarChange() {
const scale = window.innerHeight / 1080;
let right = 0;
if (scale >= 1) {
right = (585 / 2) * (scale - 1) - 20;
right = (482 / 2) * (scale - 1) - 20;
} else {
right = (585 / 2) * (scale - 1) - 20;
right = (482 / 2) * (scale - 1) - 20;
}
// console.log("right", right, "scale", scale);
this.changeRightBarStyle = [
{ right: right + "px" },
{ right: right + 20 + "px" },
{ transform: `scale(${scale})` },
];
this.changeLeftBarStyle = [
......@@ -492,6 +499,7 @@ export default {
) {
return httpFunc().then((res) => {
// 给用户加icontype
console.log("管道", res.data);
if (res.data && !res.data[0].iconType) {
res.data.forEach((item) => {
item.iconType = 6;
......@@ -518,29 +526,32 @@ export default {
labelsLayerMarksDeviceUserGoMap(httpFunc, component, show) {
return httpFunc().then((res) => {
const mapData = res.data;
console.log("用户用户",mapData)
console.log("液化气用户用户", mapData);
this.map.labelsLayerMarksDeviceUserGoMap(mapData, component, show);
});
},
labelsLayerMarksVideoGoMap(httpFunc, component, show) {
return httpFunc().then((res) => {
const mapData = res.data;
console.log('Video',mapData)
const mapData = res;
console.log("Video", mapData);
this.map.labelsLayerMarksVideoGoMap(mapData, component, show);
});
},
labelsLayerMarksCzGoMap(httpFunc, component, show) {
return httpFunc().then((res) => {
const mapData = res.data;
console.log("场站场站场站场站场站场站场站场站场站场站场站场站",mapData)
console.log(
"场站场站场站场站场站场站场站场站场站场站场站场站",
mapData
);
this.map.labelsLayerMarksCzGoMap(mapData, component, show);
});
},
labelsLayerMarksFmjGoMap(httpFunc, component, show) {
return httpFunc().then((res) => {
const mapData = res.data;
console.log("阀门井",mapData)
console.log("阀门井", mapData);
this.map.labelsLayerMarksFmjGoMap(mapData, component, show);
});
......@@ -548,14 +559,14 @@ export default {
labelsLayerMarksTysGoMap(httpFunc, component, show) {
return httpFunc().then((res) => {
const mapData = res.data;
console.log("调压箱",mapData)
console.log("调压箱", mapData);
this.map.labelsLayerMarksTysGoMap(mapData, component, show);
});
},
labelsLayerMarksDetectorUserGoMap(httpFunc, component, show) {
return httpFunc().then((res) => {
const mapData = res.data;
console.log("用户",mapData)
console.log("用户用户用户用户用户", mapData);
this.map.labelsLayerMarksDetectorUserList(mapData, component, show);
});
},
......@@ -661,7 +672,7 @@ export default {
// this.selarr1.push(item.val);
// }
this.selarr1 = [...selarr1];
console.log(this.selarr, this.selarr1)
console.log(this.selarr, this.selarr1);
this.map.allfilter(this.selarr, this.selarr1);
},
//用户的设备center
......@@ -772,7 +783,15 @@ export default {
.banner-test {
width: 100%;
height: 85px;
font-family: "YouSheBiaoTiHei";
font-size: 40px;
font-weight: normal;
line-height: normal;
letter-spacing: 0.08em;
position: relative;
color: #fff;
line-height: 85px;
top: -10px;
z-index: 998;
text-align: center;
......@@ -787,29 +806,35 @@ export default {
}
.leftbar {
width: 565px;
// width: 585px;
// height: 93%;
height: 1010px;
// height: 1010px;
height: 933px;
width: 482px;
position: fixed;
// top: 70px;
top: 50%;
margin-top: -470px;
margin-top: -450px;
z-index: 999;
background: url("../../assets/firstimage/le.png");
background-size: 105% 100%;
background-size: 100% 100%;
background-repeat: no-repeat;
margin-left: -20px;
margin-left: 2px;
pointer-events: none;
}
.rightbar {
width: 585px;
height: 1010px;
// width: 585px;
// height: 1010px;
height: 933px;
width: 482px;
position: fixed;
top: 50%;
margin-top: -470px;
margin-top: -450px;
z-index: 999;
// right: 861px;
margin-right: 4px;
background: url("../../assets/firstimage/ri.png");
background-size: 100% 100%;
background-repeat: no-repeat;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment