Commit e6073a85473827d4be8da21101a3caf6d26e3e98
Merge branch 'ft' into 'main_dev'
feat(src/packages): 设备分布修改弹窗图标显示 See merge request yunteng/thingskit-view!140
Showing
2 changed files
with
4 additions
and
4 deletions
| @@ -122,7 +122,7 @@ export const option = { | @@ -122,7 +122,7 @@ export const option = { | ||
| 122 | mpBorderConfig: { | 122 | mpBorderConfig: { |
| 123 | value: 'Border01' | 123 | value: 'Border01' |
| 124 | }, | 124 | }, |
| 125 | - bgColor: 'rgba(255, 255, 255, 0.1)', | 125 | + bgColor: 'rgba(255, 255, 255, 0.05)', |
| 126 | marker: { | 126 | marker: { |
| 127 | fillColor: '#E98984FF', | 127 | fillColor: '#E98984FF', |
| 128 | fillOpacity: 0.5, | 128 | fillOpacity: 0.5, |
| @@ -140,18 +140,18 @@ const createInfoWindow = async (extraInfo: dataExtraInfoType) => { | @@ -140,18 +140,18 @@ const createInfoWindow = async (extraInfo: dataExtraInfoType) => { | ||
| 140 | ${ | 140 | ${ |
| 141 | deviceState === 'INACTIVE' | 141 | deviceState === 'INACTIVE' |
| 142 | ? `<div style="${deviceStateContainer}"> | 142 | ? `<div style="${deviceStateContainer}"> |
| 143 | - <img onclick="handleOpenDrawer()" alt="最新数据" style="${deviceStateImg};cursor:pointer;" src="${listView}"/> | 143 | + <img onclick="handleOpenDrawer()" title="最新数据" style="${deviceStateImg};cursor:pointer;" src="${listView}"/> |
| 144 | <img style="${deviceStateImg};margin-left:0.3rem" src="${inactive}"/> | 144 | <img style="${deviceStateImg};margin-left:0.3rem" src="${inactive}"/> |
| 145 | <span style="${deviceStateText}">待激活</span> | 145 | <span style="${deviceStateText}">待激活</span> |
| 146 | </div>` | 146 | </div>` |
| 147 | : deviceState === 'ONLINE' | 147 | : deviceState === 'ONLINE' |
| 148 | ? `<div style="${deviceStateContainer}"> | 148 | ? `<div style="${deviceStateContainer}"> |
| 149 | - <img onclick="handleOpenDrawer()" alt="最新数据" style="${deviceStateImg};cursor:pointer;" src="${listView}"/> | 149 | + <img onclick="handleOpenDrawer()" title="最新数据" style="${deviceStateImg};cursor:pointer;" src="${listView}"/> |
| 150 | <img style="${deviceStateImg};margin-left:0.3rem" src="${online}"/> | 150 | <img style="${deviceStateImg};margin-left:0.3rem" src="${online}"/> |
| 151 | <span style="${deviceStateText}">在线</span> | 151 | <span style="${deviceStateText}">在线</span> |
| 152 | </div>` | 152 | </div>` |
| 153 | : `<div style="${deviceStateContainer}"> | 153 | : `<div style="${deviceStateContainer}"> |
| 154 | - <img onclick="handleOpenDrawer()" alt="最新数据" style="${deviceStateImg};cursor:pointer;" src="${listView}"/> | 154 | + <img onclick="handleOpenDrawer()" title="最新数据" style="${deviceStateImg};cursor:pointer;" src="${listView}"/> |
| 155 | <img style="${deviceStateImg};margin-left:0.3rem" src="${offline}"/> | 155 | <img style="${deviceStateImg};margin-left:0.3rem" src="${offline}"/> |
| 156 | <span style="${deviceStateText}">离线</span> | 156 | <span style="${deviceStateText}">离线</span> |
| 157 | </div>` | 157 | </div>` |