|
|
@@ -31,9 +31,9 @@
|
|
|
</div>
|
|
|
<div class="leftbar" style="width:fit-content !important;bottom:0rem;left: 1rem; top: unset;">
|
|
|
<div class="forthis">
|
|
|
- <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
|
|
|
+ <dv-border-box-7 backgroundColor="#040b1f" :color="['#25335d', '#5baffd']">
|
|
|
<div class="i-list-con">
|
|
|
- <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap; width:1080px">
|
|
|
+ <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap;">
|
|
|
<div class="icon-con" style="width: fit-content !important;"
|
|
|
v-for="(item,index) in resourcesList1" @click="fireControlViewPoint(item.type)">
|
|
|
<div class="iconfont icon icon-normal" :class="item.icon"></div>
|
|
|
@@ -1326,17 +1326,12 @@ export default {
|
|
|
res.data.forEach(function (data, index) {
|
|
|
let obj = {};
|
|
|
let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
|
|
|
- let resourceName = data.name.replaceAll("(个)", "");
|
|
|
- obj.resourceName = resourceName;
|
|
|
+ obj.resourceName = data.name.replaceAll("(个)", "");
|
|
|
obj.type = data.type;
|
|
|
obj.count = data.num;
|
|
|
obj.icon = icon;
|
|
|
- if(resourceName != "重点场所"
|
|
|
- && resourceName != "基本联动力量"
|
|
|
- && resourceName != "其他联动力量"){
|
|
|
- _this.resourcesList1.push(obj);
|
|
|
- }
|
|
|
- console.log("2222icon_" + (index + 1) + "=", icon);
|
|
|
+ _this.resourcesList1.push(obj);
|
|
|
+ console.log("icon_" + (index + 1) + "=", icon);
|
|
|
})
|
|
|
_this.resourcesList1.push({
|
|
|
resourceName: '摄像头',
|
|
|
@@ -2009,7 +2004,6 @@ export default {
|
|
|
this.eventLogList = []
|
|
|
},
|
|
|
showEventDialog(eventCode) {
|
|
|
-
|
|
|
this.getNewDataByDate(this.calendarDay)
|
|
|
this.eventCode = eventCode
|
|
|
let that = this
|
王通