iconChange

This commit is contained in:
shijing 2022-08-11 17:13:45 +08:00
parent c24f736937
commit d846e8d6ef
12 changed files with 2621 additions and 2559 deletions

View File

@ -5,10 +5,10 @@ NODE_ENV = development
VUE_APP_TITLE = '曲阳金隅安全智能管控平台'
# 接口地址
# VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
VUE_APP_WS_API = 'ws://localhost:8000'
VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
VUE_APP_BASEURL = http://127.0.0.1:8000
VUE_APP_API_BASEURL = http://1.203.161.103:2800/api
#VUE_APP_WS_API = 'ws://localhost:8000'
#VUE_APP_API_BASEURL = http://127.0.0.1:8000/api
#VUE_APP_BASEURL = http://127.0.0.1:8000
# 本地端口
VUE_APP_PORT = 2800

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 KiB

BIN
public/img/employee.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
public/img/remployee.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
public/img/visitor.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -156,12 +156,11 @@ tool.dateFormat = function (date, fmt='yyyy-MM-dd hh:mm:ss') {
"s+" : date.getSeconds(), //秒
"q+" : Math.floor((date.getMonth()+3)/3), //季度
"S" : date.getMilliseconds(), //毫秒
"W" : date.getDay(), //毫秒
};
var weeks = new Array("星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六");
var weeks = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
if(fmt==='week'){
fmt =weeks[o.w];
fmt =weeks[date.getDay()];
}else{
if(/(y+)/.test(fmt)) {
fmt=fmt.replace(RegExp.$1, (date.getFullYear()+"").substr(4 - RegExp.$1.length));

View File

@ -273,6 +273,7 @@
ref="saveRailDialog"
:areaId="areaId"
:areaName="areaName"
:areaPoints="areaPoints"
@success="handleSaveSuccess"
@closed="dialog.saveRail = false"
></save-rail-dialog>
@ -324,6 +325,7 @@ export default {
query2: {},
areaId: null,
areaName: "",
areaPoints:[],
cate_: { post: "岗位", org: "单位", people: "人员" },
};
},
@ -363,6 +365,13 @@ export default {
},
//
handleRail(row) {
debugger;
// console.log(row.third_info.xx_rail.detail.polygon.points);
if(row.third_info.xx_rail){
this.areaPoints = row.third_info.xx_rail.detail.polygon.points;
}else{
}
this.areaId = row.id;
this.areaName = row.name;
this.dialog.saveRail = true;

View File

@ -48,6 +48,9 @@
},
areaName: {
type: String,
},
areaPoints:{
type:Array,
}
},
data() {
@ -68,7 +71,7 @@
points:[],
};
},
mounted() {
mounted() {
this.$nextTick(()=>{
this.loadMap();
})
@ -135,8 +138,44 @@
locateCallback: (feature) => {
// console.log('locate..', feature);
}
});
window.map.addControl(drawTool2);
//
if(that.areaPoints.length>2){
let areaPoints = [];
let point =null;
that.areaPoints.forEach(item=>{
debugger;
let obj = {lng:345,lat:268}
console.log(obj)
let tool = new jsmap.JSMapCoordTool(window.map);
let pixel = tool.screenToMapCoordinate(obj);
debugger;
console.log(pixel)
debugger;
point = new jsmap.JSPoint(item.x,item.y,0);
areaPoints.push(point)
})
let polygonMarker = new jsmap.JSPolygonMarker({
id: that.areaId,//id
position: that.areaPoints,//
floorId: 1,//id
color: 'rgba(0,0,255,.44)',//
strokeColor: 'rgba(0,0,255,.44)',//线
depthTest: false,//
// material: new jsmap.JSWaterMaterial(), //color
allowPicking: true, //
displayCondition: new jsmap.JSDisplayCondition(0.0, 1000), //
properties: {
test: 'polygonTest'
},//
callback: (marker) => {
// console.log(marker);
}//
});
window.map.addControl(drawTool2);
window.map.addMarker(polygonMarker);
}
});
},
closeDrawer() {

File diff suppressed because it is too large Load Diff

View File

@ -11,6 +11,7 @@
<div>
<el-badge :value="operationnumber" class="item">
<el-button
class="projecting"
icon="el-icon-document-copy"
type="primary"
size="small"
@ -21,6 +22,7 @@
<div>
<el-badge :value="rpjnumber" class="item">
<el-button
class="projecting"
icon="el-icon-document-copy"
type="warning"
size="small"
@ -31,6 +33,7 @@
<div>
<el-badge :value="visitnumber" class="item">
<el-button
class="projecting"
icon="el-icon-document-copy"
type="success"
size="small"
@ -56,7 +59,7 @@
<div class="cockpit-count">
<div class="count-list">
<div class="count-list-item">
<div class="item-img item-img2"></div>
<div class="item-img item-img1"></div>
<div class="item-info">
<div title="员工" class="normal">内部员工</div>
<div class="bottom">
@ -66,7 +69,7 @@
</div>
</div>
<div class="count-list-item">
<div class="item-img item-img1"></div>
<div class="item-img item-img2"></div>
<div class="item-info">
<div title="外来人员" class="normal">访客</div>
<div class="bottom">
@ -177,6 +180,11 @@ export default {
</script>
<style scoped lang="scss">
.projecting{
width: 45px;
height: 45px;
font-size: 25px;
}
.welcome .logo {
text-align: center;
}
@ -228,26 +236,7 @@ export default {
flex: 1;
font-size: 14px;
}
.item-img {
width: 50px;
height: 50px;
position: relative;
margin-right: 6px;
flex-shrink: 0;
}
.item-img:after {
content: "";
width: 38px;
height: 38px;
position: absolute;
left: 7px;
top: 7px;
background: url(/public/img/rotate_line.png) no-repeat;
background-size: 100% 100%;
-webkit-animation: rotate 4s linear infinite;
animation: rotate 4s linear infinite;
}
.zuoye {
background: url(/public/img/zuoye.png) no-repeat;
background-size: 100% 100%;
@ -276,33 +265,34 @@ export default {
position: relative;
margin-right: 6px;
flex-shrink: 0;
border-radius: 25px;
}
.item-img:after {
content: "";
width: 38px;
height: 38px;
position: absolute;
left: 7px;
top: 7px;
background: url(/public/img/rotate_line.png) no-repeat;
background-size: 100% 100%;
-webkit-animation: rotate 4s linear infinite;
animation: rotate 4s linear infinite;
}
// .item-img:after {
// content: "";
// width: 38px;
// height: 38px;
// position: absolute;
// left: 7px;
// top: 7px;
// background: url(/public/img/rotate_line.png) no-repeat;
// background-size: 100% 100%;
// -webkit-animation: rotate 4s linear infinite;
// animation: rotate 4s linear infinite;
// }
.item-img1 {
background: url(/public/img/icon_wlry.png) no-repeat;
background: url(/public/img/employee.png) no-repeat;
background-size: 100% 100%;
}
.item-img2 {
background: url(/public/img/icon_nbyg.png) no-repeat;
background: url(/public/img/visitor.png) no-repeat;
background-size: 100% 100%;
}
.item-img3 {
background: url(/public/img/icon_cbs.png) no-repeat;
background: url(/public/img/remployee.png) no-repeat;
background-size: 100% 100%;
}