Browse Source

修改提交

wangqin
Joe 1 year ago
parent
commit
9a99df1f43
  1. 2
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue
  2. 12
      ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

2
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/Dialogs/Camera/index.vue

@ -8,7 +8,7 @@
<template #content-deviceName>
<span>{{ dialogData.deviceName || '-' }}</span>
<img @click="controlDialogVisible = true"
v-if="[0].includes(dialogData.parseOtherConfig && dialogData.parseOtherConfig.ptzCtrl)"
v-if="[0, '0'].includes(dialogData.parseOtherConfig && dialogData.parseOtherConfig.ptzCtrl)"
src="@screen/images/camera-control-icon.svg" width="18px" height="18px" style="cursor: pointer;">
</template>
</Descriptions>

12
ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js

@ -28,8 +28,8 @@ export const DeviceForMap = {
* 1 枪机 不可控
*/
const type = JSON.parse(item.otherConfig)?.ptzCtrl;
return cameraIcon[`${type}${!bool}`];
console.log(`${type}${!bool}`);
return cameraIcon[`${type}${+!bool}`];
},
},
},
@ -82,6 +82,14 @@ export const eventMap = {
item,
data,
(extData) => {
console.log(
"%c [ extData ]-85-「buttonEvent.js」",
"font-size:15px; background:#98099a; color:#dc4dde;",
{
...extData,
parseOtherConfig: JSON.parse(extData.otherConfig || "{}"),
}
);
this.dialogConfig = {
component: config.dialog,
data: {

Loading…
Cancel
Save